From cdb1cda68bc484c5d52203888847f9a115b4afe0 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 27 Feb 2016 03:48:46 +0100
Subject: [PATCH] notebook: The active tab is now :checked

:active is reserved for "mouse button down on node", so we have to use
something else. And stack switcher and radio buttons use :checked for
the active widget, so it makes sense to use :checked for the active tab,
too.

Themes have been adapted.

TODO: Implement :active for tabs.
---
 gtk/gtknotebook.c                             |   8 +-
 gtk/theme/Adwaita/_common.scss                |  14 +-
 gtk/theme/Adwaita/gtk-contained-dark.css      | 472 ++++++------
 gtk/theme/Adwaita/gtk-contained.css           | 488 ++++++-------
 gtk/theme/HighContrast/_common.scss           |  10 +-
 .../HighContrast/gtk-contained-inverse.css    | 676 +++++++++---------
 gtk/theme/HighContrast/gtk-contained.css      | 626 ++++++++--------
 7 files changed, 1147 insertions(+), 1147 deletions(-)

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 6c12dae779..abd62b2e77 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3378,10 +3378,10 @@ update_tab_state (GtkNotebook *notebook)
     {
       GtkNotebookPage *page = l->data;
 
-      tab_state = state & ~(GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT);
+      tab_state = state & ~(GTK_STATE_FLAG_CHECKED | GTK_STATE_FLAG_PRELIGHT);
 
       if (page == priv->cur_page)
-        tab_state |= GTK_STATE_FLAG_ACTIVE;
+        tab_state |= GTK_STATE_FLAG_CHECKED;
       if (page == priv->prelight_tab)
         tab_state |= GTK_STATE_FLAG_PRELIGHT;
 
@@ -6134,11 +6134,11 @@ gtk_notebook_real_switch_page (GtkNotebook     *notebook,
   if (priv->cur_page)
     {
       gtk_widget_set_child_visible (priv->cur_page->child, FALSE);
-      gtk_css_gadget_remove_state (priv->cur_page->gadget, GTK_STATE_FLAG_ACTIVE);
+      gtk_css_gadget_remove_state (priv->cur_page->gadget, GTK_STATE_FLAG_CHECKED);
     }
 
   priv->cur_page = page;
-  gtk_css_gadget_add_state (page->gadget, GTK_STATE_FLAG_ACTIVE);
+  gtk_css_gadget_add_state (page->gadget, GTK_STATE_FLAG_CHECKED);
   gtk_css_gadget_set_visible (priv->header_gadget, priv->show_tabs);
 
   if (!priv->focus_tab ||
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 5691a48cc0..6cb8f76751 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1778,7 +1778,7 @@ notebook {
         > tab {
           &:hover { box-shadow: inset 0 -3px $borders_color; }
           &:backdrop { box-shadow: none; }
-          &:active { box-shadow: inset 0 -3px $selected_bg_color; }
+          &:checked { box-shadow: inset 0 -3px $selected_bg_color; }
         }
       }
     }
@@ -1790,7 +1790,7 @@ notebook {
         > tab {
           &:hover { box-shadow: inset 0 3px $borders_color; }
           &:backdrop { box-shadow: none; }
-          &:active { box-shadow: inset 0 3px $selected_bg_color; }
+          &:checked { box-shadow: inset 0 3px $selected_bg_color; }
         }
       }
     }
@@ -1802,7 +1802,7 @@ notebook {
         > tab {
           &:hover { box-shadow: inset -3px 0 $borders_color; }
           &:backdrop { box-shadow: none; }
-          &:active { box-shadow: inset -3px 0 $selected_bg_color; }
+          &:checked { box-shadow: inset -3px 0 $selected_bg_color; }
         }
       }
     }
@@ -1814,7 +1814,7 @@ notebook {
         > tab {
           &:hover { box-shadow: inset 3px 0 $borders_color; }
           &:backdrop { box-shadow: none; }
-          &:active { box-shadow: inset 3px 0 $selected_bg_color; }
+          &:checked { box-shadow: inset 3px 0 $selected_bg_color; }
         }
       }
     }
@@ -1869,7 +1869,7 @@ notebook {
       min-width: 16px;
       border-radius: 0;
 
-      &:hover:not(:active):not(:backdrop) {
+      &:hover:not(:checked):not(:backdrop) {
         background-clip: padding-box;
         background-image: none;
         background-color: transparentize(white, 0.7);
@@ -1915,7 +1915,7 @@ notebook {
         }
       }
 
-      &:active {
+      &:checked {
         color: $fg_color;
         &.reorderable-page {
           border-color: transparentize($borders_color, 0.5);
@@ -1925,7 +1925,7 @@ notebook {
         }
       }
 
-      &:backdrop:active {
+      &:backdrop:checked {
         color: $backdrop_fg_color;
 
         &.reorderable-page {
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 5282bb29d8..60e7f78f03 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -25,7 +25,7 @@
   .background:backdrop {
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #949796;
+    color: #939695;
     background-color: #393f3f; }
 
 /*
@@ -47,8 +47,8 @@
     background-color: #212424;
     color: #eeeeec; }
   .gtkstyle-fallback:disabled {
-    background-color: #333636;
-    color: #949796; }
+    background-color: #323636;
+    color: #939695; }
   .gtkstyle-fallback:selected {
     background-color: #215d9c;
     color: #ffffff; }
@@ -63,7 +63,7 @@ textview text {
   .view text:backdrop,
   iconview text:backdrop,
   textview text:backdrop {
-    color: #d5d5d5;
+    color: #d4d4d4;
     background-color: #2c2c2c; }
   .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus,
   .view text:selected,
@@ -91,9 +91,9 @@ flowbox flowboxchild {
 label.separator {
   color: #eeeeec; }
   label.separator:backdrop {
-    color: #949796; }
+    color: #939695; }
 label:disabled {
-  color: #949796; }
+  color: #939695; }
   label:disabled:backdrop {
     color: #5d6767; }
 
@@ -111,18 +111,18 @@ assistant .sidebar {
     border-left: 1px solid #1c1f1f; }
   assistant .sidebar:backdrop {
     background-color: #2c2c2c;
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 assistant.csd .sidebar {
   border-top-style: none; }
 assistant .sidebar label {
   padding: 6px 12px; }
 assistant .sidebar label.highlight {
-  background-color: #5d6262; }
+  background-color: #5d6261; }
 
 textview {
   background-color: #313434; }
   textview:backdrop {
-    background-color: #333636; }
+    background-color: #323535; }
 
 popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification,
 .app-notification.frame, .osd .scale-popup, .osd {
@@ -164,7 +164,7 @@ entry, spinbutton:not(.vertical) {
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: #292929;
-  background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+  background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
   color: white;
   border-color: #1c1f1f;
   box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0); }
@@ -202,29 +202,29 @@ entry, spinbutton:not(.vertical) {
     border-radius: 0; }
   entry:focus, spinbutton:focus:not(.vertical) {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     box-shadow: inset 0 0 0 1px #215d9c;
     border-color: #0f2b48; }
   entry:disabled, spinbutton:disabled:not(.vertical) {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-    color: #949796;
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     box-shadow: none; }
   entry:backdrop, spinbutton:backdrop:not(.vertical) {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-    color: #d5d5d5;
-    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    color: #d4d4d4;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: none; }
   entry:backdrop:disabled, spinbutton:backdrop:disabled:not(.vertical) {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     box-shadow: none; }
   entry progress, spinbutton:not(.vertical) progress {
     margin: 2px -6px;
@@ -244,7 +244,7 @@ entry, spinbutton:not(.vertical) {
     border-color: #1a0000; }
     entry.error:focus, spinbutton.error:focus:not(.vertical) {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #cc0000;
       border-color: #1a0000; }
     entry.error:selected, spinbutton.error:selected:not(.vertical), entry.error:selected:focus, spinbutton.error:selected:focus:not(.vertical) {
@@ -254,22 +254,22 @@ entry, spinbutton:not(.vertical) {
     border-color: #432100; }
     entry.warning:focus, spinbutton.warning:focus:not(.vertical) {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #f57900;
       border-color: #432100; }
     entry.warning:selected, spinbutton.warning:selected:not(.vertical), entry.warning:selected:focus, spinbutton.warning:selected:focus:not(.vertical) {
       background-color: #f57900; }
   entry image, spinbutton:not(.vertical) image {
-    color: #c7c7c5; }
+    color: #c6c6c5; }
     entry image:hover, spinbutton:not(.vertical) image:hover {
       color: #eeeeec; }
     entry image:active, spinbutton:not(.vertical) image:active {
       color: #215d9c; }
     entry image:backdrop, spinbutton:not(.vertical) image:backdrop {
-      color: #7f8281; }
+      color: #7e8080; }
   .osd entry, .osd spinbutton:not(.vertical) {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -279,7 +279,7 @@ entry, spinbutton:not(.vertical) {
     -gtk-icon-shadow: 0 1px black; }
     .osd entry:focus, .osd spinbutton:focus:not(.vertical) {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: white;
       border-color: #215d9c;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -289,7 +289,7 @@ entry, spinbutton:not(.vertical) {
       -gtk-icon-shadow: 0 1px black; }
     .osd entry:backdrop, .osd spinbutton:backdrop:not(.vertical) {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -299,10 +299,10 @@ entry, spinbutton:not(.vertical) {
       -gtk-icon-shadow: none; }
     .osd entry:disabled, .osd spinbutton:disabled:not(.vertical) {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-      color: #878a89;
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -316,7 +316,7 @@ entry, spinbutton:not(.vertical) {
   border-top-color: #252626;
   background-image: linear-gradient(to bottom, #292929); }
   .linked.vertical > entry:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled):backdrop, .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):backdrop:not(.vertical), .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):backdrop:not(.vertical) {
-    border-top-color: #282929;
+    border-top-color: #272929;
     background-image: linear-gradient(to bottom, #2c2c2c); }
 .linked.vertical > entry:disabled + entry:disabled, .linked.vertical > spinbutton:disabled:not(.vertical) + entry:disabled, .linked.vertical > entry:disabled + spinbutton:disabled:not(.vertical), .linked.vertical > spinbutton:disabled:not(.vertical) + spinbutton:disabled:not(.vertical) {
   border-top-color: #252626; }
@@ -403,8 +403,8 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
   .titlebar notebook > header > tabs > arrow.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop, button:backdrop, button.flat:backdrop, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -419,9 +419,9 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     .titlebar button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, notebook > header > tabs > arrow:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
     .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, notebook > header > tabs > arrow:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar button.titlebutton:backdrop:checked {
-      color: #949796;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #303535);
+      color: #939695;
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     notebook > header > tabs > arrow:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
     .titlebar button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow.flat:backdrop:disabled, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
@@ -429,8 +429,8 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     .titlebar button.titlebutton:backdrop:disabled, button:backdrop:disabled, button.flat:backdrop:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
     .titlebar button.titlebutton:backdrop:disabled {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -444,8 +444,8 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     .titlebar button.titlebutton:backdrop:disabled:active, button.flat:backdrop:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:checked, button.sidebar-button:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
     .titlebar button.titlebutton:backdrop:disabled:checked {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #272929);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #262929);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   notebook > header > tabs > arrow.flat:backdrop, headerbar notebook > header > tabs > arrow.titlebutton:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar notebook > header > tabs > arrow.titlebutton:backdrop,
@@ -465,18 +465,18 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     -gtk-icon-shadow: none; }
   notebook > header > tabs > arrow:disabled, headerbar button.titlebutton:disabled,
   .titlebar button.titlebutton:disabled, button:disabled {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     notebook > header > tabs > arrow:disabled:active, headerbar button.titlebutton:disabled:active,
     .titlebar button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked, headerbar button.titlebutton:disabled:checked,
     .titlebar button.titlebutton:disabled:checked, button:disabled:active, button:disabled:checked {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #313434, #333636);
+      background-image: linear-gradient(to bottom, #2f3333, #323636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   notebook > header > tabs > arrow.image-button, headerbar button.image-button.titlebutton,
   .titlebar button.image-button.titlebutton, button.image-button {
@@ -535,9 +535,9 @@ button.osd {
     border: none;
     box-shadow: none; }
   button.osd:disabled, button.osd:backdrop:disabled {
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -581,9 +581,9 @@ popover.background.touch-selection button, popover.background.magnifier button,
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, popover.background.touch-selection button:backdrop:disabled, popover.background.magnifier button:backdrop:disabled, .app-notification button:backdrop:disabled, .osd button:disabled, .osd button:backdrop:disabled {
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -641,9 +641,9 @@ popover.background.touch-selection button, popover.background.magnifier button,
     .titlebar .app-notification button.titlebutton:disabled, .osd button.flat:disabled, .osd notebook > header > tabs > arrow:disabled, .osd button.sidebar-button:disabled, .osd headerbar button.titlebutton:disabled, headerbar .osd button.titlebutton:disabled,
     .osd .titlebar button.titlebutton:disabled,
     .titlebar .osd button.titlebutton:disabled {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -726,7 +726,7 @@ button.suggested-action {
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   button.suggested-action:backdrop, button.suggested-action.flat:backdrop, notebook > header > tabs > arrow.suggested-action:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
   .titlebar button.suggested-action.titlebutton:backdrop {
-    color: #d3dfeb;
+    color: #d2deeb;
     border-color: #0b1e33;
     background-image: linear-gradient(to bottom, #215d9c);
     text-shadow: none;
@@ -735,24 +735,24 @@ button.suggested-action {
     button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, notebook > header > tabs > arrow.suggested-action:backdrop:active, button.suggested-action.sidebar-button:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
     .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, notebook > header > tabs > arrow.suggested-action:backdrop:checked, button.suggested-action.sidebar-button:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
     .titlebar button.suggested-action.titlebutton:backdrop:checked {
-      color: #d1dae3;
+      color: #d0d9e2;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #184472);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     button.suggested-action:backdrop:disabled, button.suggested-action.flat:backdrop:disabled, notebook > header > tabs > arrow.suggested-action:backdrop:disabled, button.suggested-action.sidebar-button:backdrop:disabled, headerbar button.suggested-action.titlebutton:backdrop:disabled,
     .titlebar button.suggested-action.titlebutton:backdrop:disabled {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       button.suggested-action:backdrop:disabled:active, button.suggested-action:backdrop:disabled:checked, button.suggested-action.flat:backdrop:disabled:active, notebook > header > tabs > arrow.suggested-action:backdrop:disabled:active, button.suggested-action.sidebar-button:backdrop:disabled:active, headerbar button.suggested-action.titlebutton:backdrop:disabled:active,
       .titlebar button.suggested-action.titlebutton:backdrop:disabled:active, button.suggested-action.flat:backdrop:disabled:checked, notebook > header > tabs > arrow.suggested-action:backdrop:disabled:checked, button.suggested-action.sidebar-button:backdrop:disabled:checked, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked {
-        color: #6c88a7;
+        color: #6c88a5;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #1d4877);
+        background-image: linear-gradient(to bottom, #1d4876);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   button.suggested-action.flat:backdrop, notebook > header > tabs > arrow.suggested-action:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
   .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:disabled, notebook > header > tabs > arrow.suggested-action:disabled, button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action.titlebutton:disabled,
@@ -766,16 +766,16 @@ button.suggested-action {
     -gtk-icon-shadow: none;
     color: rgba(33, 93, 156, 0.8); }
   button.suggested-action:disabled {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     button.suggested-action:disabled:active, button.suggested-action:disabled:checked {
-      color: #a5b6c9;
+      color: #a4b5c8;
       border-color: #0b1e33;
-      background-image: linear-gradient(to bottom, #1b4470, #1d4877);
+      background-image: linear-gradient(to bottom, #1b436f, #1d4876);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .osd button.suggested-action {
     color: #eeeeec;
@@ -805,9 +805,9 @@ button.suggested-action {
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd button.suggested-action:disabled, .osd button.suggested-action:backdrop:disabled {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -855,7 +855,7 @@ button.destructive-action {
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   button.destructive-action:backdrop, button.destructive-action.flat:backdrop, notebook > header > tabs > arrow.destructive-action:backdrop, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
   .titlebar button.destructive-action.titlebutton:backdrop {
-    color: #f7cfcf;
+    color: #f6cfcf;
     border-color: #5e0707;
     background-image: linear-gradient(to bottom, #d51010);
     text-shadow: none;
@@ -871,17 +871,17 @@ button.destructive-action {
     button.destructive-action:backdrop:disabled, button.destructive-action.flat:backdrop:disabled, notebook > header > tabs > arrow.destructive-action:backdrop:disabled, button.destructive-action.sidebar-button:backdrop:disabled, headerbar button.destructive-action.titlebutton:backdrop:disabled,
     .titlebar button.destructive-action.titlebutton:backdrop:disabled {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       button.destructive-action:backdrop:disabled:active, button.destructive-action:backdrop:disabled:checked, button.destructive-action.flat:backdrop:disabled:active, notebook > header > tabs > arrow.destructive-action:backdrop:disabled:active, button.destructive-action.sidebar-button:backdrop:disabled:active, headerbar button.destructive-action.titlebutton:backdrop:disabled:active,
       .titlebar button.destructive-action.titlebutton:backdrop:disabled:active, button.destructive-action.flat:backdrop:disabled:checked, notebook > header > tabs > arrow.destructive-action:backdrop:disabled:checked, button.destructive-action.sidebar-button:backdrop:disabled:checked, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked,
       .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked {
-        color: #c46565;
+        color: #c36464;
         border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #a41212);
+        background-image: linear-gradient(to bottom, #a41111);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   button.destructive-action.flat:backdrop, notebook > header > tabs > arrow.destructive-action:backdrop, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
   .titlebar button.destructive-action.titlebutton:backdrop, button.destructive-action.flat:disabled, notebook > header > tabs > arrow.destructive-action:disabled, button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action.titlebutton:disabled,
@@ -895,16 +895,16 @@ button.destructive-action {
     -gtk-icon-shadow: none;
     color: rgba(213, 16, 16, 0.8); }
   button.destructive-action:disabled {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     button.destructive-action:disabled:active, button.destructive-action:disabled:checked {
-      color: #dba0a0;
+      color: #da9f9f;
       border-color: #5e0707;
-      background-image: linear-gradient(to bottom, #9d1111, #a41212);
+      background-image: linear-gradient(to bottom, #9d1010, #a41111);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .osd button.destructive-action {
     color: #eeeeec;
@@ -934,9 +934,9 @@ button.destructive-action {
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd button.destructive-action:disabled, .osd button.destructive-action:backdrop:disabled {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1010,40 +1010,40 @@ button.destructive-action {
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   .inline-toolbar toolbutton > button:disabled {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #313434, #333636);
+    background-image: linear-gradient(to bottom, #2f3333, #323636);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
-    color: #949796;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #303535);
+    color: #939695;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #2f3434);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:backdrop:disabled {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #272929);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #262929);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
 toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat,
@@ -1210,13 +1210,13 @@ button:visited {
     color: #74aae2; }
     *:selected *:link:hover, *:selected button:hover:link,
     *:selected button:hover:visited {
-      color: #e9eff5; }
+      color: #e8eef5; }
   *:link:active, button:active:link,
   button:active:visited {
     color: #4a90d9; }
     *:selected *:link:active, *:selected button:active:link,
     *:selected button:active:visited {
-      color: #d3dfeb; }
+      color: #d2deeb; }
   *:link:backdrop, button:backdrop:link,
   button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link,
   button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link,
@@ -1227,7 +1227,7 @@ button:visited {
   button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link,
   headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link,
   *:selected button:visited {
-    color: #d3dfeb; }
+    color: #d2deeb; }
 
 button:link,
 button:visited {
@@ -1256,7 +1256,7 @@ spinbutton:not(.vertical) {
     background-image: none;
     border-style: none none none solid;
     border-color: rgba(28, 31, 31, 0.3);
-    color: #dadad9;
+    color: #dadad8;
     border-radius: 0;
     box-shadow: none;
     min-height: 16px;
@@ -1268,13 +1268,13 @@ spinbutton:not(.vertical) {
       color: #eeeeec;
       background-color: rgba(238, 238, 236, 0.05); }
     spinbutton:not(.vertical) button:disabled {
-      color: rgba(148, 151, 150, 0.3); }
+      color: rgba(147, 150, 149, 0.3); }
     spinbutton:not(.vertical) button:active {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     spinbutton:not(.vertical) button:backdrop {
-      color: #8a8c8b;
-      border-color: rgba(31, 34, 34, 0.3);
+      color: #888b8a;
+      border-color: rgba(30, 34, 34, 0.3);
       background-color: transparent; }
     spinbutton:not(.vertical) button:backdrop:disabled {
       background-image: none;
@@ -1327,7 +1327,7 @@ spinbutton:not(.vertical) {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.5);
     -gtk-icon-shadow: none;
     box-shadow: none; }
@@ -1336,7 +1336,7 @@ spinbutton:not(.vertical) {
   .osd spinbutton:not(.vertical) button:dir(rtl):first-child {
     border-radius: 3px 0 0 3px; }
 spinbutton.vertical:disabled {
-  color: #949796; }
+  color: #939695; }
 spinbutton.vertical:backdrop:disabled {
   color: #5d6767; }
 spinbutton.vertical entry, spinbutton.vertical spinbutton:not(.vertical) {
@@ -1382,9 +1382,9 @@ spinbutton.vertical button.down {
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:disabled {
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1461,8 +1461,8 @@ searchbar,
   background-color: #303535; }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
-    border-color: #1f2222;
-    background-color: #303535;
+    border-color: #1e2222;
+    background-color: #2f3434;
     box-shadow: none; }
 
 /***************
@@ -1481,7 +1481,7 @@ headerbar {
   box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
   .titlebar:backdrop:not(headerbar),
   headerbar:backdrop {
-    border-color: #1f2222;
+    border-color: #1e2222;
     background-color: #393f3f;
     background-image: none;
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
@@ -1501,11 +1501,11 @@ headerbar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #0f2b48;
     background-image: linear-gradient(to bottom, #256ab1, #215d9c);
-    box-shadow: inset 0 -1px #1b4c7f, inset 0 1px rgba(40, 98, 159, 0.535); }
+    box-shadow: inset 0 -1px #1a4b7e, inset 0 1px rgba(40, 98, 158, 0.535); }
     .selection-mode.titlebar:backdrop:not(headerbar),
     headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #215d9c);
-      box-shadow: inset 0 1px rgba(44, 100, 160, 0.442); }
+      box-shadow: inset 0 1px rgba(43, 100, 160, 0.442); }
     .selection-mode.titlebar:not(headerbar) button,
     headerbar.selection-mode button {
       color: #ffffff;
@@ -1553,7 +1553,7 @@ headerbar {
       headerbar.selection-mode notebook > header > tabs > arrow:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop {
-        color: #d3dfeb;
+        color: #d2deeb;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #215d9c);
         text-shadow: none;
@@ -1574,7 +1574,7 @@ headerbar {
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:checked,
         headerbar.selection-mode button.titlebutton:backdrop:checked {
-          color: #d1dae3;
+          color: #d0d9e2;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #184472);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
@@ -1586,9 +1586,9 @@ headerbar {
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled,
         headerbar.selection-mode button.titlebutton:backdrop:disabled {
-          color: #6f91b4;
+          color: #6f90b2;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #22558b);
+          background-image: linear-gradient(to bottom, #22558a);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
@@ -1606,9 +1606,9 @@ headerbar {
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked,
         headerbar.selection-mode button.titlebutton:backdrop:disabled:checked {
-          color: #6c88a7;
+          color: #6c88a5;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4877);
+          background-image: linear-gradient(to bottom, #1d4876);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0f2b48; }
       .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
@@ -1635,18 +1635,18 @@ headerbar {
         -gtk-icon-shadow: none; }
       .selection-mode.titlebar:not(headerbar) button:disabled,
       headerbar.selection-mode button:disabled {
-        color: #91aac5;
+        color: #90aac4;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558b);
+        background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked,
         headerbar.selection-mode button:disabled:active,
         headerbar.selection-mode button:disabled:checked {
-          color: #a5b6c9;
+          color: #a4b5c8;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1b4470, #1d4877);
+          background-image: linear-gradient(to bottom, #1b436f, #1d4876);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .selection-mode.titlebar:not(headerbar) button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1680,17 +1680,17 @@ headerbar {
           border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
-          color: #949796;
+          color: #939695;
           border-color: #1c1f1f;
-          background-image: linear-gradient(to bottom, #333636);
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
-          color: #949796;
-          border-color: #1f2222;
+          color: #939695;
+          border-color: #1e2222;
           background-image: linear-gradient(to bottom, #393f3f);
           text-shadow: none;
           -gtk-icon-shadow: none;
@@ -1699,8 +1699,8 @@ headerbar {
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled,
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           color: #5d6767;
-          border-color: #1f2222;
-          background-image: linear-gradient(to bottom, #333636);
+          border-color: #1e2222;
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
@@ -1792,19 +1792,19 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #8c8c8b;
+  border-left-color: #8b8b8a;
   border-top-color: #393f3f; }
   treeview.view:selected, treeview.view:selected:focus {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #90aece;
+    border-left-color: #90aecd;
     border-top-color: rgba(238, 238, 236, 0.1); }
   treeview.view:disabled {
-    color: #949796; }
+    color: #939695; }
     treeview.view:disabled:selected {
-      color: #7a9ec4; }
+      color: #799dc3; }
       treeview.view:disabled:selected:backdrop {
-        color: #648eba; }
+        color: #638db9; }
     treeview.view:disabled:backdrop {
       color: #5d6767; }
   treeview.view.separator {
@@ -1813,15 +1813,15 @@ treeview.view {
     treeview.view.separator:backdrop {
       color: rgba(57, 63, 63, 0.1); }
   treeview.view:backdrop {
-    border-left-color: #676b6b;
+    border-left-color: #666a6a;
     border-top: #393f3f; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #88a6c4; }
+    border-color: #87a5c4; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #b3b3b2; }
+    color: #b2b2b1; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
@@ -1835,7 +1835,7 @@ treeview.view {
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #757776; }
+      color: #747675; }
   treeview.view.progressbar {
     border: 1px solid #0f2b48;
     border-radius: 4px;
@@ -1857,13 +1857,13 @@ treeview.view {
     treeview.view.trough:selected {
       background-color: #184472; }
   treeview.view header button {
-    color: #8c8c8b;
+    color: #8b8b8a;
     background-color: #292929;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #bdbdbc;
+      color: #bcbcbb;
       box-shadow: none;
       transition: none; }
     treeview.view header button:active {
@@ -1900,7 +1900,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   treeview.view header button:backdrop {
     border-color: #393f3f;
     border-style: none solid solid none;
-    color: #676b6b;
+    color: #666a6a;
     background-image: none;
     background-color: #2c2c2c; }
     treeview.view header button:backdrop:disabled {
@@ -1928,7 +1928,7 @@ menubar,
       color: #4a90d9; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: #949796;
+      color: #939695;
       box-shadow: none; }
 
 menu,
@@ -1942,7 +1942,7 @@ menu,
     border: none; }
   menu:backdrop,
   .menu:backdrop {
-    background-color: #2f3030; }
+    background-color: #2e2f2f; }
   menu menuitem,
   .menu menuitem {
     min-height: 16px;
@@ -1955,14 +1955,14 @@ menu,
       background-color: #215d9c; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: #949796; }
+      color: #939695; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
         color: #5d6767; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
-      color: #949796;
+      color: #939695;
       background-color: transparent; }
     menu menuitem arrow,
     .menu menuitem arrow {
@@ -1985,14 +1985,14 @@ menu,
     menu arrow.top,
     .menu arrow.top {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-      border-bottom: 1px solid #3d3d3d; }
+      border-bottom: 1px solid #3c3c3c; }
     menu arrow.bottom,
     .menu arrow.bottom {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-      border-top: 1px solid #3d3d3d; }
+      border-top: 1px solid #3c3c3c; }
     menu arrow:hover,
     .menu arrow:hover {
-      background-color: #3d3d3d; }
+      background-color: #3c3c3c; }
     menu arrow:disabled,
     .menu arrow:disabled {
       color: transparent;
@@ -2047,10 +2047,10 @@ popover.background {
 notebook > header {
   border-color: #1c1f1f;
   border-width: 1px;
-  background-color: #2f3434; }
+  background-color: #2e3333; }
   notebook > header:backdrop {
-    border-color: #1f2222;
-    background-color: #303535; }
+    border-color: #1e2222;
+    background-color: #2f3434; }
   notebook > header.top {
     border-bottom-style: solid; }
     notebook > header.top > tabs {
@@ -2059,7 +2059,7 @@ notebook > header {
         box-shadow: inset 0 -3px #1c1f1f; }
       notebook > header.top > tabs > tab:backdrop {
         box-shadow: none; }
-      notebook > header.top > tabs > tab:active {
+      notebook > header.top > tabs > tab:checked {
         box-shadow: inset 0 -3px #215d9c; }
   notebook > header.bottom {
     border-top-style: solid; }
@@ -2069,7 +2069,7 @@ notebook > header {
         box-shadow: inset 0 3px #1c1f1f; }
       notebook > header.bottom > tabs > tab:backdrop {
         box-shadow: none; }
-      notebook > header.bottom > tabs > tab:active {
+      notebook > header.bottom > tabs > tab:checked {
         box-shadow: inset 0 3px #215d9c; }
   notebook > header.left {
     border-right-style: solid; }
@@ -2079,7 +2079,7 @@ notebook > header {
         box-shadow: inset -3px 0 #1c1f1f; }
       notebook > header.left > tabs > tab:backdrop {
         box-shadow: none; }
-      notebook > header.left > tabs > tab:active {
+      notebook > header.left > tabs > tab:checked {
         box-shadow: inset -3px 0 #215d9c; }
   notebook > header.right {
     border-left-style: solid; }
@@ -2089,7 +2089,7 @@ notebook > header {
         box-shadow: inset 3px 0 #1c1f1f; }
       notebook > header.right > tabs > tab:backdrop {
         box-shadow: none; }
-      notebook > header.right > tabs > tab:active {
+      notebook > header.right > tabs > tab:checked {
         box-shadow: inset 3px 0 #215d9c; }
   notebook > header.top > tabs > arrow {
     border-top-style: none; }
@@ -2121,7 +2121,7 @@ notebook > header {
     min-height: 16px;
     min-width: 16px;
     border-radius: 0; }
-    notebook > header > tabs > arrow:hover:not(:active):not(:backdrop) {
+    notebook > header > tabs > arrow:hover:not(:checked):not(:backdrop) {
       background-clip: padding-box;
       background-image: none;
       background-color: rgba(255, 255, 255, 0.3);
@@ -2136,31 +2136,31 @@ notebook > header {
     min-width: 30px;
     padding: 3px 12px;
     outline-offset: -5px;
-    color: #949796;
+    color: #939695;
     font-weight: bold;
     border-width: 1px;
     border-color: transparent; }
     notebook > header tab:hover {
-      color: #c1c3c1; }
+      color: #c0c2c0; }
       notebook > header tab:hover.reorderable-page {
         border-color: rgba(28, 31, 31, 0.3);
         background-color: rgba(57, 63, 63, 0.2); }
     notebook > header tab:backdrop {
-      color: #707473; }
+      color: #6f7372; }
       notebook > header tab:backdrop.reorderable-page {
         border-color: transparent;
         background-color: transparent; }
-    notebook > header tab:active {
+    notebook > header tab:checked {
       color: #eeeeec; }
-      notebook > header tab:active.reorderable-page {
+      notebook > header tab:checked.reorderable-page {
         border-color: rgba(28, 31, 31, 0.5);
         background-color: rgba(57, 63, 63, 0.5); }
-        notebook > header tab:active.reorderable-page:hover {
+        notebook > header tab:checked.reorderable-page:hover {
           background-color: rgba(57, 63, 63, 0.7); }
-    notebook > header tab:backdrop:active {
-      color: #949796; }
-      notebook > header tab:backdrop:active.reorderable-page {
-        border-color: #1f2222;
+    notebook > header tab:backdrop:checked {
+      color: #939695; }
+      notebook > header tab:backdrop:checked.reorderable-page {
+        border-color: #1e2222;
         background-color: #393f3f; }
     notebook > header tab button.flat, notebook > header tab notebook > header > tabs > arrow, notebook > header tab button.sidebar-button, notebook > header tab headerbar button.titlebutton, headerbar notebook > header tab button.titlebutton,
     notebook > header tab .titlebar button.titlebutton,
@@ -2252,15 +2252,15 @@ scrollbar trough {
   border: 1px none #1c1f1f; }
   scrollbar trough:backdrop {
     background-color: #323737;
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 scrollbar slider {
-  background-color: #a6a8a7; }
+  background-color: #a5a8a6; }
   scrollbar slider:hover {
-    background-color: #cacbc9; }
+    background-color: #c9cbc9; }
   scrollbar slider:hover:active {
     background-color: #2a76c6; }
   scrollbar slider:backdrop {
-    background-color: #5d6262; }
+    background-color: #5d6161; }
   scrollbar slider:disabled {
     background-color: transparent; }
 scrollbar slider {
@@ -2311,16 +2311,16 @@ switch {
     box-shadow: 0 1px transparent;
     text-shadow: 0 1px rgba(15, 43, 72, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:disabled {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
     background-image: none;
-    background-color: #333636;
+    background-color: #323636;
     box-shadow: 0 1px transparent;
     text-shadow: none; }
   switch:backdrop {
-    color: #949796;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #303535);
+    color: #939695;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #2f3434);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2329,9 +2329,9 @@ switch {
       box-shadow: none; }
   switch:disabled {
     color: #5d6767;
-    border-color: #1f2222;
+    border-color: #1e2222;
     background-image: none;
-    background-color: #333636; }
+    background-color: #323636; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -2354,15 +2354,15 @@ switch {
   switch:active slider {
     border: 1px solid #0f2b48; }
   switch:disabled slider {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   switch:backdrop slider {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2371,8 +2371,8 @@ switch {
     border-color: #0f2b48; }
   switch:backdrop:disabled slider {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -2424,7 +2424,7 @@ checkbutton.text-button, radiobutton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   checkbutton.text-button:disabled, checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate {
-    color: #949796; }
+    color: #939695; }
     checkbutton.text-button:disabled:backdrop, checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop {
       color: #5d6767; }
 
@@ -2463,16 +2463,16 @@ radio {
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   check:disabled,
   radio:disabled {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   check:backdrop,
   radio:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2480,8 +2480,8 @@ radio {
     check:backdrop:disabled,
     radio:backdrop:disabled {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -2575,7 +2575,7 @@ treeview.view radio:dir(ltr):selected:backdrop:hover,
 treeview.view radio:dir(ltr):selected:backdrop,
 treeview.view radio:dir(ltr):backdrop:hover,
 treeview.view radio:dir(ltr):backdrop {
-  color: #949796; }
+  color: #939695; }
 treeview.view check:dir(rtl):selected:backdrop:disabled, treeview.view check:dir(rtl):backdrop:disabled, treeview.view check:dir(ltr):selected:backdrop:disabled, treeview.view check:dir(ltr):backdrop:disabled,
 treeview.view radio:dir(rtl):selected:backdrop:disabled,
 treeview.view radio:dir(rtl):backdrop:disabled,
@@ -2587,7 +2587,7 @@ treeview.view radio:dir(rtl):selected:disabled,
 treeview.view radio:dir(rtl):disabled,
 treeview.view radio:dir(ltr):selected:disabled,
 treeview.view radio:dir(ltr):disabled {
-  color: #949796; }
+  color: #939695; }
 
 /************
  * GtkScale *
@@ -2595,17 +2595,17 @@ treeview.view radio:dir(ltr):disabled {
 scale trough, scale fill, progressbar trough {
   border: 1px solid #1c1f1f;
   border-radius: 3px;
-  background-color: #2f3434;
+  background-color: #2e3333;
   box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
   scale trough:disabled, scale fill:disabled, progressbar trough:disabled {
-    background-color: #333636;
+    background-color: #323636;
     box-shadow: none; }
   scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough {
-    background-color: #303535;
-    border-color: #1f2222;
+    background-color: #2f3434;
+    border-color: #1e2222;
     box-shadow: none; }
     scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled {
-      background-color: #333636; }
+      background-color: #323636; }
   row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough {
     box-shadow: none; }
     row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled {
@@ -2616,7 +2616,7 @@ scale trough, scale fill, progressbar trough {
     box-shadow: none;
     outline-color: rgba(238, 238, 236, 0.2); }
     .osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled {
-      background-color: rgba(53, 57, 58, 0.5); }
+      background-color: rgba(52, 57, 57, 0.5); }
 
 scale highlight, progressbar progress {
   border: 1px solid #0f2b48;
@@ -2688,23 +2688,23 @@ scale {
     scale slider:active {
       border-color: #0f2b48; }
     scale slider:disabled {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     scale slider:backdrop {
-      color: #949796;
-      border-color: #1f2222;
+      color: #939695;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       scale slider:backdrop:disabled {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -2740,9 +2740,9 @@ scale {
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd scale slider:disabled {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -3015,15 +3015,15 @@ levelbar trough {
   padding: 2px;
   border-radius: 3px;
   background-color: #292929;
-  background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+  background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
   color: white;
   border-color: #1c1f1f;
   box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0); }
   levelbar trough:backdrop {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-    color: #d5d5d5;
-    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    color: #d4d4d4;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: none; }
 levelbar.horizontal.discrete block {
@@ -3060,7 +3060,7 @@ levelbar block.empty {
   border-color: rgba(238, 238, 236, 0.1);
   box-shadow: none; }
   levelbar block.empty:backdrop {
-    border-color: rgba(148, 151, 150, 0.15); }
+    border-color: rgba(147, 150, 149, 0.15); }
 
 /****************
  * Print dialog *
@@ -3071,8 +3071,8 @@ printdialog paper {
   background: white;
   padding: 0; }
   printdialog paper:backdrop {
-    color: #949796;
-    border-color: #1f2222; }
+    color: #939695;
+    border-color: #1e2222; }
 printdialog .dialog-action-box {
   margin: 12px; }
 
@@ -3091,7 +3091,7 @@ frame border,
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 
 actionbar > revealer > box {
   padding: 6px;
@@ -3111,7 +3111,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -3129,7 +3129,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -3147,7 +3147,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -3165,7 +3165,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -3226,7 +3226,7 @@ scrolledwindow junction {
     border-image-slice: 0 1 0 0; }
   placessidebar junction:backdrop,
   scrolledwindow junction:backdrop {
-    border-image-source: linear-gradient(to bottom, #1f2222 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #1e2222 1px, transparent 1px);
     background-color: #323737; }
 
 separator {
@@ -3243,7 +3243,7 @@ list {
   border-color: #1c1f1f; }
   list:backdrop {
     background-color: #2c2c2c;
-    border-color: #1f2222; }
+    border-color: #1e2222; }
   list row {
     padding: 2px; }
 
@@ -3256,7 +3256,7 @@ row.activatable:backdrop:hover {
 row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 row.activatable:selected.has-open-popup, row.activatable:selected:hover {
-  background-color: #366ca4; }
+  background-color: #356ba4; }
 row.activatable:selected:backdrop {
   background-color: #215d9c; }
 
@@ -3268,7 +3268,7 @@ row:selected .titlebar button.titlebutton:not(:active):not(:checked):not(:hover)
   row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected notebook > header > tabs > arrow:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected headerbar button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop, headerbar row:selected button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop,
   row:selected .titlebar button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop,
   .titlebar row:selected button.titlebutton:not(:active):not(:checked):not(:hover):not(disabled):backdrop {
-    color: #949796; }
+    color: #939695; }
 
 row {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
@@ -3324,17 +3324,17 @@ calendar {
     calendar.button:hover {
       color: #eeeeec; }
     calendar.button:backdrop {
-      color: rgba(148, 151, 150, 0.45); }
+      color: rgba(147, 150, 149, 0.45); }
     calendar.button:disabled {
-      color: rgba(148, 151, 150, 0.45); }
+      color: rgba(147, 150, 149, 0.45); }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
     font-size: smaller;
     color: #eeeeec; }
   calendar:backdrop {
-    color: #d5d5d5;
-    border-color: #1f2222; }
+    color: #d4d4d4;
+    border-color: #1e2222; }
 
 /***********
  * Dialogs *
@@ -3366,7 +3366,7 @@ messagedialog.csd .dialog-action-area button {
 filechooser .dialog-action-box {
   border-top: 1px solid #1c1f1f; }
   filechooser .dialog-action-box:backdrop {
-    border-top-color: #1f2222; }
+    border-top-color: #1e2222; }
 filechooser #pathbarbox {
   border-bottom: 1px solid #393f3f; }
 filechooser actionbar > revealer > box {
@@ -3379,7 +3379,7 @@ filechooser actionbar > revealer > box {
   border: none;
   background-color: #313434; }
   .sidebar:backdrop {
-    background-color: #333636; }
+    background-color: #323535; }
   .sidebar list {
     background-color: transparent; }
 
@@ -3449,7 +3449,7 @@ paned > separator {
   paned > separator:selected {
     background-image: linear-gradient(to top, #215d9c); }
   paned > separator:backdrop {
-    background-image: linear-gradient(to top, #1f2222); }
+    background-image: linear-gradient(to top, #1e2222); }
   paned > separator.wide {
     margin: 0;
     padding: 0;
@@ -3458,7 +3458,7 @@ paned > separator {
     background-image: linear-gradient(to top, #1c1f1f), linear-gradient(to top, #1c1f1f);
     background-size: 1px 1px, 1px 1px; }
     paned > separator.wide:backdrop {
-      background-image: linear-gradient(to top, #1f2222), linear-gradient(to top, #1f2222); }
+      background-image: linear-gradient(to top, #1e2222), linear-gradient(to top, #1e2222); }
 paned.horizontal > separator {
   background-repeat: repeat-y; }
   paned.horizontal > separator:dir(ltr) {
@@ -3535,9 +3535,9 @@ infobar {
     .question button:disabled,
     .warning button:disabled,
     .error button:disabled {
-      color: #91aac5;
+      color: #90aac4;
       border-color: #0b1e33;
-      background-image: linear-gradient(to bottom, #22558b);
+      background-image: linear-gradient(to bottom, #22558a);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -3545,7 +3545,7 @@ infobar {
     .question button:backdrop,
     .warning button:backdrop,
     .error button:backdrop {
-      color: #d3dfeb;
+      color: #d2deeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -3556,9 +3556,9 @@ infobar {
       .question button:backdrop:disabled,
       .warning button:backdrop:disabled,
       .error button:backdrop:disabled {
-        color: #6f91b4;
+        color: #6f90b2;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558b);
+        background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
@@ -3635,7 +3635,7 @@ colorswatch.light overlay {
   colorswatch.light overlay:hover {
     border-color: #1c1f1f; }
   colorswatch.light overlay:backdrop {
-    color: #d5d5d5; }
+    color: #d4d4d4; }
 colorswatch overlay {
   box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5);
   border: 1px solid #1c1f1f; }
@@ -3665,8 +3665,8 @@ colorswatch#add-color-button {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
     colorswatch#add-color-button overlay:backdrop {
-      color: #949796;
-      border-color: #1f2222;
+      color: #939695;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       -gtk-icon-shadow: none;
@@ -3735,7 +3735,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #393f3f;
-    border: solid 1px #1f2222;
+    border: solid 1px #1e2222;
     box-shadow: none; }
 
 headerbar button.titlebutton,
@@ -3782,7 +3782,7 @@ entry selection:focus, modelbutton.flat:selected,
   textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled:selected,
   label selection:disabled, entry selection:disabled, spinbutton:not(.vertical) selection:disabled, modelbutton.flat:disabled:selected,
   .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
-    color: #90aece; }
+    color: #90aecd; }
   .view:backdrop:selected, iconview:backdrop:selected, iconview:backdrop:selected:focus,
   .view text:backdrop:selected,
   iconview text:backdrop:selected,
@@ -3801,7 +3801,7 @@ entry selection:focus, modelbutton.flat:selected,
     textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, label:backdrop:disabled:selected,
     label selection:backdrop:disabled, entry selection:backdrop:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected,
     .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label {
-      color: #648eba; }
+      color: #638db9; }
 
 .monospace {
   font: Monospace; }
@@ -3864,7 +3864,7 @@ button.circular {
   font-size: smaller; }
   .keycap:backdrop {
     background-color: #2c2c2c;
-    color: #949796; }
+    color: #939695; }
 
 *:drop(active):focus,
 *:drop(active) {
@@ -3903,16 +3903,16 @@ text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /*
 base background color of insensitive widgets */
-@define-color insensitive_bg_color #333636;
+@define-color insensitive_bg_color #323636;
 /*
 text foreground color of insensitive widgets */
-@define-color insensitive_fg_color #949796;
+@define-color insensitive_fg_color #939695;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #292929;
 /*
 widget text/foreground color on backdrop windows */
-@define-color theme_unfocused_fg_color #949796;
+@define-color theme_unfocused_fg_color #939695;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color white;
@@ -3933,7 +3933,7 @@ widgets main borders color */
 @define-color borders #1c1f1f;
 /*
 widgets main borders color on backdrop windows */
-@define-color unfocused_borders #1f2222;
+@define-color unfocused_borders #1e2222;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -3943,7 +3943,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#eeeeec, 1.8);
-@define-color wm_unfocused_title #949796;
+@define-color wm_unfocused_title #939695;
 @define-color wm_highlight transparent;
 @define-color wm_borders_edge rgba(238, 238, 236, 0.07);
 @define-color wm_bg_a shade(#393f3f, 1.2);
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index d8de88c653..6f8034ce04 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -25,7 +25,7 @@
   .background:backdrop {
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #8b8e8f;
+    color: #8b8e8e;
     background-color: #e8e8e7; }
 
 /*
@@ -47,8 +47,8 @@
     background-color: #cfcfcd;
     color: #2e3436; }
   .gtkstyle-fallback:disabled {
-    background-color: #f1f1f1;
-    color: #8b8e8f; }
+    background-color: #f1f1f0;
+    color: #8b8e8e; }
   .gtkstyle-fallback:selected {
     background-color: #4a90d9;
     color: #ffffff; }
@@ -63,7 +63,7 @@ textview text {
   .view text:backdrop,
   iconview text:backdrop,
   textview text:backdrop {
-    color: #333333;
+    color: #323232;
     background-color: white; }
   .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus,
   .view text:selected,
@@ -91,9 +91,9 @@ flowbox flowboxchild {
 label.separator {
   color: #2e3436; }
   label.separator:backdrop {
-    color: #8b8e8f; }
+    color: #8b8e8e; }
 label:disabled {
-  color: #8b8e8f; }
+  color: #8b8e8e; }
   label:disabled:backdrop {
     color: #c3c3c0; }
 
@@ -111,18 +111,18 @@ assistant .sidebar {
     border-left: 1px solid #9d9d99; }
   assistant .sidebar:backdrop {
     background-color: white;
-    border-color: #a5a5a1; }
+    border-color: #a4a4a0; }
 assistant.csd .sidebar {
   border-top-style: none; }
 assistant .sidebar label {
   padding: 6px 12px; }
 assistant .sidebar label.highlight {
-  background-color: #c3c4c4; }
+  background-color: #c2c4c3; }
 
 textview {
-  background-color: #f4f4f3; }
+  background-color: #f3f3f3; }
   textview:backdrop {
-    background-color: #f4f4f3; }
+    background-color: #f3f3f3; }
 
 popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification,
 .app-notification.frame, .osd .scale-popup, .osd {
@@ -164,7 +164,7 @@ entry, spinbutton:not(.vertical) {
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: #ffffff;
-  background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+  background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
   color: black;
   border-color: #9d9d99;
   box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0); }
@@ -202,29 +202,29 @@ entry, spinbutton:not(.vertical) {
     border-radius: 0; }
   entry:focus, spinbutton:focus:not(.vertical) {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
     box-shadow: inset 0 0 0 1px #4a90d9;
     border-color: #4a90d9; }
   entry:disabled, spinbutton:disabled:not(.vertical) {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
-    color: #8b8e8f;
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     box-shadow: none; }
   entry:backdrop, spinbutton:backdrop:not(.vertical) {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
-    color: #333333;
-    border-color: #a5a5a1;
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+    color: #323232;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, white);
     box-shadow: none; }
   entry:backdrop:disabled, spinbutton:backdrop:disabled:not(.vertical) {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
     color: #c3c3c0;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #f1f1f0);
     box-shadow: none; }
   entry progress, spinbutton:not(.vertical) progress {
     margin: 2px -6px;
@@ -244,7 +244,7 @@ entry, spinbutton:not(.vertical) {
     border-color: #cc0000; }
     entry.error:focus, spinbutton.error:focus:not(.vertical) {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
       box-shadow: inset 0 0 0 1px #cc0000;
       border-color: #cc0000; }
     entry.error:selected, spinbutton.error:selected:not(.vertical), entry.error:selected:focus, spinbutton.error:selected:focus:not(.vertical) {
@@ -254,22 +254,22 @@ entry, spinbutton:not(.vertical) {
     border-color: #f57900; }
     entry.warning:focus, spinbutton.warning:focus:not(.vertical) {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
       box-shadow: inset 0 0 0 1px #f57900;
       border-color: #f57900; }
     entry.warning:selected, spinbutton.warning:selected:not(.vertical), entry.warning:selected:focus, spinbutton.warning:selected:focus:not(.vertical) {
       background-color: #f57900; }
   entry image, spinbutton:not(.vertical) image {
-    color: #585d5e; }
+    color: #575c5e; }
     entry image:hover, spinbutton:not(.vertical) image:hover {
       color: #2e3436; }
     entry image:active, spinbutton:not(.vertical) image:active {
       color: #4a90d9; }
     entry image:backdrop, spinbutton:not(.vertical) image:backdrop {
-      color: #a2a5a5; }
+      color: #a2a4a4; }
   .osd entry, .osd spinbutton:not(.vertical) {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -279,7 +279,7 @@ entry, spinbutton:not(.vertical) {
     -gtk-icon-shadow: 0 1px black; }
     .osd entry:focus, .osd spinbutton:focus:not(.vertical) {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
       color: white;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -289,7 +289,7 @@ entry, spinbutton:not(.vertical) {
       -gtk-icon-shadow: 0 1px black; }
     .osd entry:backdrop, .osd spinbutton:backdrop:not(.vertical) {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -299,10 +299,10 @@ entry, spinbutton:not(.vertical) {
       -gtk-icon-shadow: none; }
     .osd entry:disabled, .osd spinbutton:disabled:not(.vertical) {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
-      color: #878a89;
+      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -313,13 +313,13 @@ entry, spinbutton:not(.vertical) {
 .linked.vertical > entry:focus:not(:last-child), .linked.vertical > spinbutton:focus:not(:last-child):not(.vertical) {
   box-shadow: inset 0 0 0 1px #4a90d9; }
 .linked.vertical > entry:not(:disabled) + entry:not(:disabled), .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):not(.vertical), .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical) {
-  border-top-color: #e2e2e0;
+  border-top-color: #e1e1e0;
   background-image: linear-gradient(to bottom, #ffffff); }
   .linked.vertical > entry:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled):backdrop, .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):backdrop:not(.vertical), .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):backdrop:not(.vertical) {
-    border-top-color: #e4e4e3;
+    border-top-color: #e3e3e2;
     background-image: linear-gradient(to bottom, white); }
 .linked.vertical > entry:disabled + entry:disabled, .linked.vertical > spinbutton:disabled:not(.vertical) + entry:disabled, .linked.vertical > entry:disabled + spinbutton:disabled:not(.vertical), .linked.vertical > spinbutton:disabled:not(.vertical) + spinbutton:disabled:not(.vertical) {
-  border-top-color: #e2e2e0; }
+  border-top-color: #e1e1e0; }
 .linked.vertical > entry + entry:focus:not(:last-child), .linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:last-child), .linked.vertical > entry + spinbutton:focus:not(:last-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:last-child):not(.vertical) {
   border-top-color: #4a90d9;
   box-shadow: inset 0 0 0 1px #4a90d9; }
@@ -403,8 +403,8 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
   .titlebar notebook > header > tabs > arrow.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop, button:backdrop, button.flat:backdrop, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
+    color: #8b8e8e;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -419,9 +419,9 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     .titlebar button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, notebook > header > tabs > arrow:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
     .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, notebook > header > tabs > arrow:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar button.titlebutton:backdrop:checked {
-      color: #8b8e8f;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #d1d1cf);
+      color: #8b8e8e;
+      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #d0d0ce);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     notebook > header > tabs > arrow:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
     .titlebar button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow.flat:backdrop:disabled, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
@@ -429,8 +429,8 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     .titlebar button.titlebutton:backdrop:disabled, button:backdrop:disabled, button.flat:backdrop:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
     .titlebar button.titlebutton:backdrop:disabled {
       color: #c3c3c0;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -444,8 +444,8 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     .titlebar button.titlebutton:backdrop:disabled:active, button.flat:backdrop:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:checked, button.sidebar-button:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
     .titlebar button.titlebutton:backdrop:disabled:checked {
       color: #c3c3c0;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #e4e4e4);
+      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #e5e5e3);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   notebook > header > tabs > arrow.flat:backdrop, headerbar notebook > header > tabs > arrow.titlebutton:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar notebook > header > tabs > arrow.titlebutton:backdrop,
@@ -465,18 +465,18 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     -gtk-icon-shadow: none; }
   notebook > header > tabs > arrow:disabled, headerbar button.titlebutton:disabled,
   .titlebar button.titlebutton:disabled, button:disabled {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     notebook > header > tabs > arrow:disabled:active, headerbar button.titlebutton:disabled:active,
     .titlebar button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked, headerbar button.titlebutton:disabled:checked,
     .titlebar button.titlebutton:disabled:checked, button:disabled:active, button:disabled:checked {
-      color: #8b8e8f;
+      color: #8b8e8e;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1);
+      background-image: linear-gradient(to bottom, #e8e8e7, #f1f1f0);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   notebook > header > tabs > arrow.image-button, headerbar button.image-button.titlebutton,
   .titlebar button.image-button.titlebutton, button.image-button {
@@ -535,9 +535,9 @@ button.osd {
     border: none;
     box-shadow: none; }
   button.osd:disabled, button.osd:backdrop:disabled {
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -581,9 +581,9 @@ popover.background.touch-selection button, popover.background.magnifier button,
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, popover.background.touch-selection button:backdrop:disabled, popover.background.magnifier button:backdrop:disabled, .app-notification button:backdrop:disabled, .osd button:disabled, .osd button:backdrop:disabled {
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -641,9 +641,9 @@ popover.background.touch-selection button, popover.background.magnifier button,
     .titlebar .app-notification button.titlebutton:disabled, .osd button.flat:disabled, .osd notebook > header > tabs > arrow:disabled, .osd button.sidebar-button:disabled, .osd headerbar button.titlebutton:disabled, headerbar .osd button.titlebutton:disabled,
     .osd .titlebar button.titlebutton:disabled,
     .titlebar .osd button.titlebutton:disabled {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -726,7 +726,7 @@ button.suggested-action {
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   button.suggested-action:backdrop, button.suggested-action.flat:backdrop, notebook > header > tabs > arrow.suggested-action:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
   .titlebar button.suggested-action.titlebutton:backdrop {
-    color: #dbe9f7;
+    color: #dae8f7;
     border-color: #4a90d9;
     background-image: linear-gradient(to bottom, #4a90d9);
     text-shadow: none;
@@ -735,24 +735,24 @@ button.suggested-action {
     button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, notebook > header > tabs > arrow.suggested-action:backdrop:active, button.suggested-action.sidebar-button:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
     .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, notebook > header > tabs > arrow.suggested-action:backdrop:checked, button.suggested-action.sidebar-button:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
     .titlebar button.suggested-action.titlebutton:backdrop:checked {
-      color: #d4e4f4;
+      color: #d4e3f3;
       border-color: #2a76c6;
       background-image: linear-gradient(to bottom, #2a76c6);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     button.suggested-action:backdrop:disabled, button.suggested-action.flat:backdrop:disabled, notebook > header > tabs > arrow.suggested-action:backdrop:disabled, button.suggested-action.sidebar-button:backdrop:disabled, headerbar button.suggested-action.titlebutton:backdrop:disabled,
     .titlebar button.suggested-action.titlebutton:backdrop:disabled {
       color: #c3c3c0;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       button.suggested-action:backdrop:disabled:active, button.suggested-action:backdrop:disabled:checked, button.suggested-action.flat:backdrop:disabled:active, notebook > header > tabs > arrow.suggested-action:backdrop:disabled:active, button.suggested-action.sidebar-button:backdrop:disabled:active, headerbar button.suggested-action.titlebutton:backdrop:disabled:active,
       .titlebar button.suggested-action.titlebutton:backdrop:disabled:active, button.suggested-action.flat:backdrop:disabled:checked, notebook > header > tabs > arrow.suggested-action:backdrop:disabled:checked, button.suggested-action.sidebar-button:backdrop:disabled:checked, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked {
-        color: #8db9e8;
-        border-color: #5094db;
-        background-image: linear-gradient(to bottom, #5094db);
+        color: #8db8e6;
+        border-color: #5093da;
+        background-image: linear-gradient(to bottom, #5093da);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   button.suggested-action.flat:backdrop, notebook > header > tabs > arrow.suggested-action:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
   .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:disabled, notebook > header > tabs > arrow.suggested-action:disabled, button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action.titlebutton:disabled,
@@ -766,16 +766,16 @@ button.suggested-action {
     -gtk-icon-shadow: none;
     color: rgba(74, 144, 217, 0.8); }
   button.suggested-action:disabled {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     button.suggested-action:disabled:active, button.suggested-action:disabled:checked {
-      color: #b9d4f1;
+      color: #b9d3f0;
       border-color: #1c5187;
-      background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
+      background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .osd button.suggested-action {
     color: #eeeeec;
@@ -805,9 +805,9 @@ button.suggested-action {
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd button.suggested-action:disabled, .osd button.suggested-action:backdrop:disabled {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -855,7 +855,7 @@ button.destructive-action {
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   button.destructive-action:backdrop, button.destructive-action.flat:backdrop, notebook > header > tabs > arrow.destructive-action:backdrop, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
   .titlebar button.destructive-action.titlebutton:backdrop {
-    color: #fcd4d4;
+    color: #fbd4d4;
     border-color: #ef2929;
     background-image: linear-gradient(to bottom, #ef2929);
     text-shadow: none;
@@ -864,22 +864,22 @@ button.destructive-action {
     button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, notebook > header > tabs > arrow.destructive-action:backdrop:active, button.destructive-action.sidebar-button:backdrop:active, headerbar button.destructive-action.titlebutton:backdrop:active,
     .titlebar button.destructive-action.titlebutton:backdrop:active, button.destructive-action.flat:backdrop:checked, notebook > header > tabs > arrow.destructive-action:backdrop:checked, button.destructive-action.sidebar-button:backdrop:checked, headerbar button.destructive-action.titlebutton:backdrop:checked,
     .titlebar button.destructive-action.titlebutton:backdrop:checked {
-      color: #f7cfcf;
+      color: #f6cfcf;
       border-color: #d51010;
       background-image: linear-gradient(to bottom, #d51010);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     button.destructive-action:backdrop:disabled, button.destructive-action.flat:backdrop:disabled, notebook > header > tabs > arrow.destructive-action:backdrop:disabled, button.destructive-action.sidebar-button:backdrop:disabled, headerbar button.destructive-action.titlebutton:backdrop:disabled,
     .titlebar button.destructive-action.titlebutton:backdrop:disabled {
       color: #c3c3c0;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       button.destructive-action:backdrop:disabled:active, button.destructive-action:backdrop:disabled:checked, button.destructive-action.flat:backdrop:disabled:active, notebook > header > tabs > arrow.destructive-action:backdrop:disabled:active, button.destructive-action.sidebar-button:backdrop:disabled:active, headerbar button.destructive-action.titlebutton:backdrop:disabled:active,
       .titlebar button.destructive-action.titlebutton:backdrop:disabled:active, button.destructive-action.flat:backdrop:disabled:checked, notebook > header > tabs > arrow.destructive-action:backdrop:disabled:checked, button.destructive-action.sidebar-button:backdrop:disabled:checked, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked,
       .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked {
-        color: #f57979;
+        color: #f47979;
         border-color: #ef3131;
         background-image: linear-gradient(to bottom, #ef3131);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -895,14 +895,14 @@ button.destructive-action {
     -gtk-icon-shadow: none;
     color: rgba(239, 41, 41, 0.8); }
   button.destructive-action:disabled {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     button.destructive-action:disabled:active, button.destructive-action:disabled:checked {
-      color: #f9adad;
+      color: #f8acac;
       border-color: #8e0b0b;
       background-image: linear-gradient(to bottom, #e52d2d, #ef3131);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -934,9 +934,9 @@ button.destructive-action {
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd button.destructive-action:disabled, .osd button.destructive-action:backdrop:disabled {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1010,40 +1010,40 @@ button.destructive-action {
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   .inline-toolbar toolbutton > button:disabled {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1);
+    background-image: linear-gradient(to bottom, #e8e8e7, #f1f1f0);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:backdrop {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
+    color: #8b8e8e;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #d1d1cf);
+    color: #8b8e8e;
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #d0d0ce);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:backdrop:disabled {
     color: #c3c3c0;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
     color: #c3c3c0;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #e4e4e4);
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #e5e5e3);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
 toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat,
@@ -1208,19 +1208,19 @@ button:visited {
     color: #215d9c; }
     *:selected *:link:visited, *:selected button:visited:link,
     *:selected button:visited {
-      color: #b7d3f0; }
+      color: #b6d2ef; }
   *:link:hover, button:hover:link,
   button:hover:visited {
     color: #4a90d9; }
     *:selected *:link:hover, *:selected button:hover:link,
     *:selected button:hover:visited {
-      color: #edf4fb; }
+      color: #ecf3fb; }
   *:link:active, button:active:link,
   button:active:visited {
     color: #2a76c6; }
     *:selected *:link:active, *:selected button:active:link,
     *:selected button:active:visited {
-      color: #dbe9f7; }
+      color: #dae8f7; }
   *:link:backdrop, button:backdrop:link,
   button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link,
   button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link,
@@ -1231,7 +1231,7 @@ button:visited {
   button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link,
   headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link,
   *:selected button:visited {
-    color: #dbe9f7; }
+    color: #dae8f7; }
 
 button:link,
 button:visited {
@@ -1260,7 +1260,7 @@ spinbutton:not(.vertical) {
     background-image: none;
     border-style: none none none solid;
     border-color: rgba(157, 157, 153, 0.3);
-    color: #43484a;
+    color: #42484a;
     border-radius: 0;
     box-shadow: none;
     min-height: 16px;
@@ -1272,13 +1272,13 @@ spinbutton:not(.vertical) {
       color: #2e3436;
       background-color: rgba(46, 52, 54, 0.05); }
     spinbutton:not(.vertical) button:disabled {
-      color: rgba(139, 142, 143, 0.3); }
+      color: rgba(139, 142, 142, 0.3); }
     spinbutton:not(.vertical) button:active {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     spinbutton:not(.vertical) button:backdrop {
-      color: #97999a;
-      border-color: rgba(165, 165, 161, 0.3);
+      color: #969999;
+      border-color: rgba(164, 164, 160, 0.3);
       background-color: transparent; }
     spinbutton:not(.vertical) button:backdrop:disabled {
       background-image: none;
@@ -1331,7 +1331,7 @@ spinbutton:not(.vertical) {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.5);
     -gtk-icon-shadow: none;
     box-shadow: none; }
@@ -1340,7 +1340,7 @@ spinbutton:not(.vertical) {
   .osd spinbutton:not(.vertical) button:dir(rtl):first-child {
     border-radius: 3px 0 0 3px; }
 spinbutton.vertical:disabled {
-  color: #8b8e8f; }
+  color: #8b8e8e; }
 spinbutton.vertical:backdrop:disabled {
   color: #c3c3c0; }
 spinbutton.vertical entry, spinbutton.vertical spinbutton:not(.vertical) {
@@ -1386,9 +1386,9 @@ spinbutton.vertical button.down {
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:disabled {
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1462,11 +1462,11 @@ searchbar,
 .location-bar {
   border-style: solid;
   border-color: #9d9d99;
-  background-color: #d2d2d0; }
+  background-color: #d1d1cf; }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
-    border-color: #a5a5a1;
-    background-color: #d1d1cf;
+    border-color: #a4a4a0;
+    background-color: #d0d0ce;
     box-shadow: none; }
 
 /***************
@@ -1485,7 +1485,7 @@ headerbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
   .titlebar:backdrop:not(headerbar),
   headerbar:backdrop {
-    border-color: #a5a5a1;
+    border-color: #a4a4a0;
     background-color: #e8e8e7;
     background-image: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
@@ -1505,11 +1505,11 @@ headerbar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #184472;
     background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9);
-    box-shadow: inset 0 -1px #3975b5, inset 0 1px rgba(146, 188, 232, 0.9); }
+    box-shadow: inset 0 -1px #3875b4, inset 0 1px rgba(146, 188, 232, 0.9); }
     .selection-mode.titlebar:backdrop:not(headerbar),
     headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #4a90d9);
-      box-shadow: inset 0 1px rgba(165, 200, 236, 0.88); }
+      box-shadow: inset 0 1px rgba(164, 199, 236, 0.88); }
     .selection-mode.titlebar:not(headerbar) button,
     headerbar.selection-mode button {
       color: #ffffff;
@@ -1557,7 +1557,7 @@ headerbar {
       headerbar.selection-mode notebook > header > tabs > arrow:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop {
-        color: #dbe9f7;
+        color: #dae8f7;
         border-color: #4a90d9;
         background-image: linear-gradient(to bottom, #4a90d9);
         text-shadow: none;
@@ -1578,7 +1578,7 @@ headerbar {
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:checked,
         headerbar.selection-mode button.titlebutton:backdrop:checked {
-          color: #d4e4f4;
+          color: #d4e3f3;
           border-color: #2a76c6;
           background-image: linear-gradient(to bottom, #2a76c6);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
@@ -1590,9 +1590,9 @@ headerbar {
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled,
         headerbar.selection-mode button.titlebutton:backdrop:disabled {
-          color: #9bc2ea;
-          border-color: #65a1df;
-          background-image: linear-gradient(to bottom, #65a1df);
+          color: #9ac1e9;
+          border-color: #65a0de;
+          background-image: linear-gradient(to bottom, #65a0de);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
@@ -1610,9 +1610,9 @@ headerbar {
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked,
         headerbar.selection-mode button.titlebutton:backdrop:disabled:checked {
-          color: #8db9e8;
-          border-color: #5094db;
-          background-image: linear-gradient(to bottom, #5094db);
+          color: #8db8e6;
+          border-color: #5093da;
+          background-image: linear-gradient(to bottom, #5093da);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #184472; }
       .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
@@ -1639,18 +1639,18 @@ headerbar {
         -gtk-icon-shadow: none; }
       .selection-mode.titlebar:not(headerbar) button:disabled,
       headerbar.selection-mode button:disabled {
-        color: #b2d0ef;
+        color: #b2cfee;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #65a1df);
+        background-image: linear-gradient(to bottom, #65a0de);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked,
         headerbar.selection-mode button:disabled:active,
         headerbar.selection-mode button:disabled:checked {
-          color: #b9d4f1;
+          color: #b9d3f0;
           border-color: #1c5187;
-          background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
+          background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .selection-mode.titlebar:not(headerbar) button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1684,17 +1684,17 @@ headerbar {
           border-color: #184472; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
-          color: #8b8e8f;
+          color: #8b8e8e;
           border-color: #9d9d99;
-          background-image: linear-gradient(to bottom, #f1f1f1);
+          background-image: linear-gradient(to bottom, #f1f1f0);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #184472; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
-          color: #8b8e8f;
-          border-color: #a5a5a1;
+          color: #8b8e8e;
+          border-color: #a4a4a0;
           background-image: linear-gradient(to bottom, #e8e8e7);
           text-shadow: none;
           -gtk-icon-shadow: none;
@@ -1703,8 +1703,8 @@ headerbar {
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled,
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           color: #c3c3c0;
-          border-color: #a5a5a1;
-          background-image: linear-gradient(to bottom, #f1f1f1);
+          border-color: #a4a4a0;
+          background-image: linear-gradient(to bottom, #f1f1f0);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
@@ -1796,15 +1796,15 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #979a9b;
+  border-left-color: #96999a;
   border-top-color: #e8e8e7; }
   treeview.view:selected, treeview.view:selected:focus {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #a5c8ec;
+    border-left-color: #a4c7ec;
     border-top-color: rgba(46, 52, 54, 0.1); }
   treeview.view:disabled {
-    color: #8b8e8f; }
+    color: #8b8e8e; }
     treeview.view:disabled:selected {
       color: #92bce8; }
       treeview.view:disabled:selected:backdrop {
@@ -1817,29 +1817,29 @@ treeview.view {
     treeview.view.separator:backdrop {
       color: rgba(232, 232, 231, 0.1); }
   treeview.view:backdrop {
-    border-left-color: #babbbb;
+    border-left-color: #b9bbba;
     border-top: #e8e8e7; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #3c6288; }
+    border-color: #3c6287; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #6d7172; }
+    color: #6c7072; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #2e3436; }
     treeview.view.expander:selected {
-      color: #c9def4; }
+      color: #c8ddf3; }
       treeview.view.expander:selected:hover {
         color: #ffffff; }
       treeview.view.expander:selected:backdrop {
-        color: #c9def4; }
+        color: #c8ddf3; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #aeb0b1; }
+      color: #adafaf; }
   treeview.view.progressbar {
     color: #ffffff;
     border: 1px solid #184472;
@@ -1867,13 +1867,13 @@ treeview.view {
       border-style: solid;
       border-color: #4a90d9; }
   treeview.view header button {
-    color: #979a9b;
+    color: #96999a;
     background-color: #ffffff;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #636769;
+      color: #626668;
       box-shadow: none;
       transition: none; }
     treeview.view header button:active {
@@ -1910,7 +1910,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   treeview.view header button:backdrop {
     border-color: #e8e8e7;
     border-style: none solid solid none;
-    color: #babbbb;
+    color: #b9bbba;
     background-image: none;
     background-color: white; }
     treeview.view header button:backdrop:disabled {
@@ -1938,7 +1938,7 @@ menubar,
       color: #2a76c6; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: #8b8e8f;
+      color: #8b8e8e;
       box-shadow: none; }
 
 menu,
@@ -1965,14 +1965,14 @@ menu,
       background-color: #4a90d9; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: #8b8e8f; }
+      color: #8b8e8e; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
         color: #c3c3c0; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
-      color: #8b8e8f;
+      color: #8b8e8e;
       background-color: transparent; }
     menu menuitem arrow,
     .menu menuitem arrow {
@@ -1995,14 +1995,14 @@ menu,
     menu arrow.top,
     .menu arrow.top {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-      border-bottom: 1px solid #eaebeb; }
+      border-bottom: 1px solid #eaeaea; }
     menu arrow.bottom,
     .menu arrow.bottom {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-      border-top: 1px solid #eaebeb; }
+      border-top: 1px solid #eaeaea; }
     menu arrow:hover,
     .menu arrow:hover {
-      background-color: #eaebeb; }
+      background-color: #eaeaea; }
     menu arrow:disabled,
     .menu arrow:disabled {
       color: transparent;
@@ -2057,10 +2057,10 @@ popover.background {
 notebook > header {
   border-color: #9d9d99;
   border-width: 1px;
-  background-color: #cececc; }
+  background-color: #cdcdcb; }
   notebook > header:backdrop {
-    border-color: #a5a5a1;
-    background-color: #d1d1cf; }
+    border-color: #a4a4a0;
+    background-color: #d0d0ce; }
   notebook > header.top {
     border-bottom-style: solid; }
     notebook > header.top > tabs {
@@ -2069,7 +2069,7 @@ notebook > header {
         box-shadow: inset 0 -3px #9d9d99; }
       notebook > header.top > tabs > tab:backdrop {
         box-shadow: none; }
-      notebook > header.top > tabs > tab:active {
+      notebook > header.top > tabs > tab:checked {
         box-shadow: inset 0 -3px #4a90d9; }
   notebook > header.bottom {
     border-top-style: solid; }
@@ -2079,7 +2079,7 @@ notebook > header {
         box-shadow: inset 0 3px #9d9d99; }
       notebook > header.bottom > tabs > tab:backdrop {
         box-shadow: none; }
-      notebook > header.bottom > tabs > tab:active {
+      notebook > header.bottom > tabs > tab:checked {
         box-shadow: inset 0 3px #4a90d9; }
   notebook > header.left {
     border-right-style: solid; }
@@ -2089,7 +2089,7 @@ notebook > header {
         box-shadow: inset -3px 0 #9d9d99; }
       notebook > header.left > tabs > tab:backdrop {
         box-shadow: none; }
-      notebook > header.left > tabs > tab:active {
+      notebook > header.left > tabs > tab:checked {
         box-shadow: inset -3px 0 #4a90d9; }
   notebook > header.right {
     border-left-style: solid; }
@@ -2099,7 +2099,7 @@ notebook > header {
         box-shadow: inset 3px 0 #9d9d99; }
       notebook > header.right > tabs > tab:backdrop {
         box-shadow: none; }
-      notebook > header.right > tabs > tab:active {
+      notebook > header.right > tabs > tab:checked {
         box-shadow: inset 3px 0 #4a90d9; }
   notebook > header.top > tabs > arrow {
     border-top-style: none; }
@@ -2131,7 +2131,7 @@ notebook > header {
     min-height: 16px;
     min-width: 16px;
     border-radius: 0; }
-    notebook > header > tabs > arrow:hover:not(:active):not(:backdrop) {
+    notebook > header > tabs > arrow:hover:not(:checked):not(:backdrop) {
       background-clip: padding-box;
       background-image: none;
       background-color: rgba(255, 255, 255, 0.3);
@@ -2146,31 +2146,31 @@ notebook > header {
     min-width: 30px;
     padding: 3px 12px;
     outline-offset: -5px;
-    color: #8b8e8f;
+    color: #8b8e8e;
     font-weight: bold;
     border-width: 1px;
     border-color: transparent; }
     notebook > header tab:hover {
-      color: #5d6163; }
+      color: #5c6162; }
       notebook > header tab:hover.reorderable-page {
         border-color: rgba(157, 157, 153, 0.3);
         background-color: rgba(232, 232, 231, 0.2); }
     notebook > header tab:backdrop {
-      color: #b0b2b2; }
+      color: #b0b2b1; }
       notebook > header tab:backdrop.reorderable-page {
         border-color: transparent;
         background-color: transparent; }
-    notebook > header tab:active {
+    notebook > header tab:checked {
       color: #2e3436; }
-      notebook > header tab:active.reorderable-page {
+      notebook > header tab:checked.reorderable-page {
         border-color: rgba(157, 157, 153, 0.5);
         background-color: rgba(232, 232, 231, 0.5); }
-        notebook > header tab:active.reorderable-page:hover {
+        notebook > header tab:checked.reorderable-page:hover {
           background-color: rgba(232, 232, 231, 0.7); }
-    notebook > header tab:backdrop:active {
-      color: #8b8e8f; }
-      notebook > header tab:backdrop:active.reorderable-page {
-        border-color: #a5a5a1;
+    notebook > header tab:backdrop:checked {
+      color: #8b8e8e; }
+      notebook > header tab:backdrop:checked.reorderable-page {
+        border-color: #a4a4a0;
         background-color: #e8e8e7; }
     notebook > header tab button.flat, notebook > header tab notebook > header > tabs > arrow, notebook > header tab button.sidebar-button, notebook > header tab headerbar button.titlebutton, headerbar notebook > header tab button.titlebutton,
     notebook > header tab .titlebar button.titlebutton,
@@ -2262,15 +2262,15 @@ scrollbar trough {
   border: 1px none #9d9d99; }
   scrollbar trough:backdrop {
     background-color: #e1e1df;
-    border-color: #a5a5a1; }
+    border-color: #a4a4a0; }
 scrollbar slider {
-  background-color: #787c7d; }
+  background-color: #787c7c; }
   scrollbar slider:hover {
     background-color: #535859; }
   scrollbar slider:hover:active {
     background-color: #2a76c6; }
   scrollbar slider:backdrop {
-    background-color: #c3c4c4; }
+    background-color: #c2c4c3; }
   scrollbar slider:disabled {
     background-color: transparent; }
 scrollbar slider {
@@ -2311,7 +2311,7 @@ switch {
   border: 1px solid #9d9d99;
   border-radius: 3px;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, #cacac8);
+  background-image: linear-gradient(to bottom, #cacac7);
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
   switch:active {
     color: white;
@@ -2321,16 +2321,16 @@ switch {
     box-shadow: 0 1px transparent;
     text-shadow: 0 1px rgba(24, 68, 114, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:disabled {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
     background-image: none;
-    background-color: #f1f1f1;
+    background-color: #f1f1f0;
     box-shadow: 0 1px transparent;
     text-shadow: none; }
   switch:backdrop {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #d1d1cf);
+    color: #8b8e8e;
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #d0d0ce);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2340,9 +2340,9 @@ switch {
       box-shadow: none; }
   switch:disabled {
     color: #c3c3c0;
-    border-color: #a5a5a1;
+    border-color: #a4a4a0;
     background-image: none;
-    background-color: #f1f1f1; }
+    background-color: #f1f1f0; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -2365,15 +2365,15 @@ switch {
   switch:active slider {
     border: 1px solid #184472; }
   switch:disabled slider {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   switch:backdrop slider {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
+    color: #8b8e8e;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2382,8 +2382,8 @@ switch {
     border-color: #4a90d9; }
   switch:backdrop:disabled slider {
     color: #c3c3c0;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -2446,7 +2446,7 @@ checkbutton.text-button, radiobutton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   checkbutton.text-button:disabled, checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate {
-    color: #8b8e8f; }
+    color: #8b8e8e; }
     checkbutton.text-button:disabled:backdrop, checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop {
       color: #c3c3c0; }
 
@@ -2485,16 +2485,16 @@ radio {
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   check:disabled,
   radio:disabled {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   check:backdrop,
   radio:backdrop {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
+    color: #8b8e8e;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2502,8 +2502,8 @@ radio {
     check:backdrop:disabled,
     radio:backdrop:disabled {
       color: #c3c3c0;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -2606,7 +2606,7 @@ treeview.view radio:dir(ltr):selected:backdrop:hover,
 treeview.view radio:dir(ltr):selected:backdrop,
 treeview.view radio:dir(ltr):backdrop:hover,
 treeview.view radio:dir(ltr):backdrop {
-  color: #8b8e8f; }
+  color: #8b8e8e; }
 treeview.view check:dir(rtl):selected:backdrop:disabled, treeview.view check:dir(rtl):backdrop:disabled, treeview.view check:dir(ltr):selected:backdrop:disabled, treeview.view check:dir(ltr):backdrop:disabled,
 treeview.view radio:dir(rtl):selected:backdrop:disabled,
 treeview.view radio:dir(rtl):backdrop:disabled,
@@ -2618,7 +2618,7 @@ treeview.view radio:dir(rtl):selected:disabled,
 treeview.view radio:dir(rtl):disabled,
 treeview.view radio:dir(ltr):selected:disabled,
 treeview.view radio:dir(ltr):disabled {
-  color: #8b8e8f; }
+  color: #8b8e8e; }
 
 /************
  * GtkScale *
@@ -2626,17 +2626,17 @@ treeview.view radio:dir(ltr):disabled {
 scale trough, scale fill, progressbar trough {
   border: 1px solid #9d9d99;
   border-radius: 3px;
-  background-color: #cececc;
+  background-color: #cdcdcb;
   box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
   scale trough:disabled, scale fill:disabled, progressbar trough:disabled {
-    background-color: #f1f1f1;
+    background-color: #f1f1f0;
     box-shadow: none; }
   scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough {
-    background-color: #d1d1cf;
-    border-color: #a5a5a1;
+    background-color: #d0d0ce;
+    border-color: #a4a4a0;
     box-shadow: none; }
     scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled {
-      background-color: #f1f1f1; }
+      background-color: #f1f1f0; }
   row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough {
     box-shadow: none; }
     row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled {
@@ -2647,7 +2647,7 @@ scale trough, scale fill, progressbar trough {
     box-shadow: none;
     outline-color: rgba(238, 238, 236, 0.2); }
     .osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled {
-      background-color: rgba(53, 57, 58, 0.5); }
+      background-color: rgba(52, 57, 57, 0.5); }
 
 scale highlight, progressbar progress {
   border: 1px solid #184472;
@@ -2719,23 +2719,23 @@ scale {
     scale slider:active {
       border-color: #184472; }
     scale slider:disabled {
-      color: #8b8e8f;
+      color: #8b8e8e;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     scale slider:backdrop {
-      color: #8b8e8f;
-      border-color: #a5a5a1;
+      color: #8b8e8e;
+      border-color: #a4a4a0;
       background-image: linear-gradient(to bottom, #e8e8e7);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       scale slider:backdrop:disabled {
         color: #c3c3c0;
-        border-color: #a5a5a1;
-        background-image: linear-gradient(to bottom, #f1f1f1);
+        border-color: #a4a4a0;
+        background-image: linear-gradient(to bottom, #f1f1f0);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -2771,9 +2771,9 @@ scale {
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd scale slider:disabled {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -3046,15 +3046,15 @@ levelbar trough {
   padding: 2px;
   border-radius: 3px;
   background-color: #ffffff;
-  background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+  background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
   color: black;
   border-color: #9d9d99;
   box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0); }
   levelbar trough:backdrop {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
-    color: #333333;
-    border-color: #a5a5a1;
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+    color: #323232;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, white);
     box-shadow: none; }
 levelbar.horizontal.discrete block {
@@ -3091,7 +3091,7 @@ levelbar block.empty {
   border-color: rgba(46, 52, 54, 0.2);
   box-shadow: none; }
   levelbar block.empty:backdrop {
-    border-color: rgba(139, 142, 143, 0.15); }
+    border-color: rgba(139, 142, 142, 0.15); }
 
 /****************
  * Print dialog *
@@ -3102,8 +3102,8 @@ printdialog paper {
   background: white;
   padding: 0; }
   printdialog paper:backdrop {
-    color: #8b8e8f;
-    border-color: #a5a5a1; }
+    color: #8b8e8e;
+    border-color: #a4a4a0; }
 printdialog .dialog-action-box {
   margin: 12px; }
 
@@ -3122,7 +3122,7 @@ frame border,
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #a5a5a1; }
+    border-color: #a4a4a0; }
 
 actionbar > revealer > box {
   padding: 6px;
@@ -3142,7 +3142,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -3160,7 +3160,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -3178,7 +3178,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -3196,7 +3196,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -3257,7 +3257,7 @@ scrolledwindow junction {
     border-image-slice: 0 1 0 0; }
   placessidebar junction:backdrop,
   scrolledwindow junction:backdrop {
-    border-image-source: linear-gradient(to bottom, #a5a5a1 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #a4a4a0 1px, transparent 1px);
     background-color: #e1e1df; }
 
 separator {
@@ -3274,7 +3274,7 @@ list {
   border-color: #9d9d99; }
   list:backdrop {
     background-color: white;
-    border-color: #a5a5a1; }
+    border-color: #a4a4a0; }
   list row {
     padding: 2px; }
 
@@ -3287,7 +3287,7 @@ row.activatable:backdrop:hover {
 row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 row.activatable:selected.has-open-popup, row.activatable:selected:hover {
-  background-color: #4787c9; }
+  background-color: #4786c8; }
 row.activatable:selected:backdrop {
   background-color: #4a90d9; }
 
@@ -3357,17 +3357,17 @@ calendar {
     calendar.button:hover {
       color: #2e3436; }
     calendar.button:backdrop {
-      color: rgba(139, 142, 143, 0.45); }
+      color: rgba(139, 142, 142, 0.45); }
     calendar.button:disabled {
-      color: rgba(139, 142, 143, 0.45); }
+      color: rgba(139, 142, 142, 0.45); }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
     font-size: smaller;
     color: #2e3436; }
   calendar:backdrop {
-    color: #333333;
-    border-color: #a5a5a1; }
+    color: #323232;
+    border-color: #a4a4a0; }
 
 /***********
  * Dialogs *
@@ -3399,7 +3399,7 @@ messagedialog.csd .dialog-action-area button {
 filechooser .dialog-action-box {
   border-top: 1px solid #9d9d99; }
   filechooser .dialog-action-box:backdrop {
-    border-top-color: #a5a5a1; }
+    border-top-color: #a4a4a0; }
 filechooser #pathbarbox {
   border-bottom: 1px solid #e8e8e7; }
 filechooser actionbar > revealer > box {
@@ -3410,9 +3410,9 @@ filechooser actionbar > revealer > box {
  ***********/
 .sidebar {
   border: none;
-  background-color: #f4f4f3; }
+  background-color: #f3f3f3; }
   .sidebar:backdrop {
-    background-color: #f4f4f3; }
+    background-color: #f3f3f3; }
   .sidebar list {
     background-color: transparent; }
 
@@ -3482,7 +3482,7 @@ paned > separator {
   paned > separator:selected {
     background-image: linear-gradient(to top, #4a90d9); }
   paned > separator:backdrop {
-    background-image: linear-gradient(to top, #a5a5a1); }
+    background-image: linear-gradient(to top, #a4a4a0); }
   paned > separator.wide {
     margin: 0;
     padding: 0;
@@ -3491,7 +3491,7 @@ paned > separator {
     background-image: linear-gradient(to top, #9d9d99), linear-gradient(to top, #9d9d99);
     background-size: 1px 1px, 1px 1px; }
     paned > separator.wide:backdrop {
-      background-image: linear-gradient(to top, #a5a5a1), linear-gradient(to top, #a5a5a1); }
+      background-image: linear-gradient(to top, #a4a4a0), linear-gradient(to top, #a4a4a0); }
 paned.horizontal > separator {
   background-repeat: repeat-y; }
   paned.horizontal > separator:dir(ltr) {
@@ -3568,9 +3568,9 @@ infobar {
     .question button:disabled,
     .warning button:disabled,
     .error button:disabled {
-      color: #b2d0ef;
+      color: #b2cfee;
       border-color: #1c5187;
-      background-image: linear-gradient(to bottom, #65a1df);
+      background-image: linear-gradient(to bottom, #65a0de);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -3578,7 +3578,7 @@ infobar {
     .question button:backdrop,
     .warning button:backdrop,
     .error button:backdrop {
-      color: #dbe9f7;
+      color: #dae8f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -3589,9 +3589,9 @@ infobar {
       .question button:backdrop:disabled,
       .warning button:backdrop:disabled,
       .error button:backdrop:disabled {
-        color: #9bc2ea;
-        border-color: #65a1df;
-        background-image: linear-gradient(to bottom, #65a1df);
+        color: #9ac1e9;
+        border-color: #65a0de;
+        background-image: linear-gradient(to bottom, #65a0de);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
@@ -3668,7 +3668,7 @@ colorswatch.light overlay {
   colorswatch.light overlay:hover {
     border-color: rgba(0, 0, 0, 0.5); }
   colorswatch.light overlay:backdrop {
-    color: #333333; }
+    color: #323232; }
 colorswatch overlay {
   box-shadow: inset 0 2px 2px -3px rgba(0, 0, 0, 0.7);
   border: 1px solid rgba(0, 0, 0, 0.3); }
@@ -3698,8 +3698,8 @@ colorswatch#add-color-button {
       -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white; }
     colorswatch#add-color-button overlay:backdrop {
-      color: #8b8e8f;
-      border-color: #a5a5a1;
+      color: #8b8e8e;
+      border-color: #a4a4a0;
       background-image: linear-gradient(to bottom, #e8e8e7);
       text-shadow: none;
       -gtk-icon-shadow: none;
@@ -3768,7 +3768,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #e8e8e7;
-    border: solid 1px #a5a5a1;
+    border: solid 1px #a4a4a0;
     box-shadow: none; }
 
 headerbar button.titlebutton,
@@ -3816,7 +3816,7 @@ entry selection:focus, modelbutton.flat:selected,
   textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled:selected,
   label selection:disabled, entry selection:disabled, spinbutton:not(.vertical) selection:disabled, modelbutton.flat:disabled:selected,
   .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
-    color: #a5c8ec; }
+    color: #a4c7ec; }
   .view:backdrop:selected, iconview:backdrop:selected, iconview:backdrop:selected:focus,
   .view text:backdrop:selected,
   iconview text:backdrop:selected,
@@ -3892,13 +3892,13 @@ button.circular {
   color: #2e3436;
   background-color: #ffffff;
   border: 1px solid;
-  border-color: #c3c3c0;
+  border-color: #c2c2c0;
   border-radius: 5px;
-  box-shadow: inset 0 -3px #ededec;
+  box-shadow: inset 0 -3px #ececeb;
   font-size: smaller; }
   .keycap:backdrop {
     background-color: white;
-    color: #8b8e8f; }
+    color: #8b8e8e; }
 
 *:drop(active):focus,
 *:drop(active) {
@@ -3937,16 +3937,16 @@ text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /*
 base background color of insensitive widgets */
-@define-color insensitive_bg_color #f1f1f1;
+@define-color insensitive_bg_color #f1f1f0;
 /*
 text foreground color of insensitive widgets */
-@define-color insensitive_fg_color #8b8e8f;
+@define-color insensitive_fg_color #8b8e8e;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #ffffff;
 /*
 widget text/foreground color on backdrop windows */
-@define-color theme_unfocused_fg_color #8b8e8f;
+@define-color theme_unfocused_fg_color #8b8e8e;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color black;
@@ -3967,7 +3967,7 @@ widgets main borders color */
 @define-color borders #9d9d99;
 /*
 widgets main borders color on backdrop windows */
-@define-color unfocused_borders #a5a5a1;
+@define-color unfocused_borders #a4a4a0;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -3977,7 +3977,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#2e3436, 1.8);
-@define-color wm_unfocused_title #8b8e8f;
+@define-color wm_unfocused_title #8b8e8e;
 @define-color wm_highlight rgba(255, 255, 255, 0.8);
 @define-color wm_borders_edge rgba(255, 255, 255, 0.8);
 @define-color wm_bg_a shade(#e8e8e7, 1.2);
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 5a0350bc5f..5d8c9b82e2 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -1304,7 +1304,7 @@ notebook {
     & tabs arrow {
       color: $insensitive_fg_color;
       &:hover { color: mix($fg_color, $insensitive_fg_color, 50%); }
-      &:active { color: $fg_color; }
+      &:checked { color: $fg_color; }
       &:disabled { color: transparentize($insensitive_fg_color,0.7); }
       &:backdrop { color: transparentize($backdrop_fg_color,0.6); }
     }
@@ -1366,7 +1366,7 @@ notebook {
     &:hover {
       border-color: $borders_color;
     }
-    &:active, &:backdrop:active {
+    &:checked, &:backdrop:checked {
       border-color: $selected_bg_color;
     }
     &:backdrop {
@@ -1384,7 +1384,7 @@ notebook {
           border-#{$_border}-color: $borders_color;
           background-color: transparentize($bg_color,0.8);
         }
-        &:active {
+        &:checked {
           background-color: transparentize($bg_color,0.5);
           border-color: transparentize($borders_color,0.5);
           border-#{$_border}-color: $selected_bg_color;
@@ -1413,7 +1413,7 @@ notebook {
       // prelight tab text
       color: mix($fg_color, $insensitive_fg_color, 50%);
     }
-    &:active label {
+    &:checked label {
       // active tab text
       color: $fg_color;
       &:backdrop { color: $backdrop_fg_color; }
@@ -1431,7 +1431,7 @@ notebook {
         background-image: none;
         box-shadow: none;
       }
-      &:active {
+      &:checked {
         @include button(active, $edge: none);
         border-width: 2px;
       }
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css
index d485cfab6c..23ec9300e1 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -4,16 +4,16 @@
 @define-color theme_base_color #111;
 @define-color theme_selected_bg_color #aaa;
 @define-color theme_selected_fg_color #fff;
-@define-color insensitive_bg_color #070707;
-@define-color insensitive_fg_color gray;
+@define-color insensitive_bg_color #060606;
+@define-color insensitive_fg_color #7f7f7f;
 @define-color insensitive_base_color #111;
 @define-color theme_unfocused_fg_color #fff;
 @define-color theme_unfocused_bg_color #000;
 @define-color theme_unfocused_base_color #111;
 @define-color theme_unfocused_selected_bg_color #aaa;
 @define-color theme_unfocused_selected_fg_color #fff;
-@define-color borders gray;
-@define-color unfocused_borders #737373;
+@define-color borders #7f7f7f;
+@define-color unfocused_borders #727272;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #73d216;
@@ -79,8 +79,8 @@
     background-color: black;
     color: #fff; }
   .gtkstyle-fallback:disabled {
-    background-color: #070707;
-    color: gray; }
+    background-color: #060606;
+    color: #7f7f7f; }
   .gtkstyle-fallback:selected {
     background-color: #aaa;
     color: #fff; }
@@ -106,7 +106,7 @@ flowbox flowboxchild {
     outline-offset: -2px; }
 
 label:disabled, label:backdrop:disabled {
-  color: gray; }
+  color: #7f7f7f; }
 
 /*********************
  * Spinner Animation *
@@ -135,15 +135,15 @@ entry, spinbutton {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #090909, #111 90%);
-  border-color: gray;
-  box-shadow: inset 0 2px 2px -2px #090909; }
+  border-color: #7f7f7f;
+  box-shadow: inset 0 2px 2px -2px #080808; }
   entry.flat, entry.flat:focus, spinbutton.flat, spinbutton.flat:focus {
     padding: 2px;
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    border-color: gray;
-    box-shadow: inset 0 2px 2px -2px #090909;
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #080808;
     border: none;
     border-radius: 0; }
   entry:focus, spinbutton:focus {
@@ -151,14 +151,14 @@ entry, spinbutton {
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
     border-color: #aaa;
-    box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #303030; }
+    box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #2f2f2f; }
   entry:disabled, spinbutton:disabled {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    color: gray;
-    border-color: gray;
-    background-image: linear-gradient(to bottom, #070707);
+    color: #7f7f7f;
+    border-color: #7f7f7f;
+    background-image: linear-gradient(to bottom, #060606);
     box-shadow: none; }
   entry:backdrop, spinbutton:backdrop {
     background-color: transparent;
@@ -171,7 +171,7 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    color: gray;
+    color: #7f7f7f;
     background-image: linear-gradient(to bottom, #000);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry selection, entry selection:backdrop, spinbutton selection, spinbutton selection:backdrop {
@@ -203,8 +203,8 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    border-color: gray;
-    box-shadow: inset 0 2px 2px -2px #090909;
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #080808;
     background-image: linear-gradient(to bottom, #111);
     border-bottom-color: #323232;
     box-shadow: none; }
@@ -215,16 +215,16 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      color: gray;
-      border-color: gray;
-      background-image: linear-gradient(to bottom, #070707);
+      color: #7f7f7f;
+      border-color: #7f7f7f;
+      background-image: linear-gradient(to bottom, #060606);
       box-shadow: none;
       border-bottom-color: #323232; }
       .linked.vertical entry:disabled:backdrop, .linked.vertical spinbutton:disabled:backdrop {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: gray;
+        color: #7f7f7f;
         background-image: linear-gradient(to bottom, #000);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
         border-bottom-color: #2e2e2e; }
@@ -240,29 +240,29 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      border-color: gray;
-      box-shadow: inset 0 2px 2px -2px #090909;
+      border-color: #7f7f7f;
+      box-shadow: inset 0 2px 2px -2px #080808;
       border-bottom-color: #323232; }
       .linked.vertical entry:first-child:focus, .linked.vertical spinbutton:first-child:focus {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
         border-color: #aaa;
-        box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #303030; }
+        box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #2f2f2f; }
       .linked.vertical entry:first-child:disabled, .linked.vertical spinbutton:first-child:disabled {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: gray;
-        border-color: gray;
-        background-image: linear-gradient(to bottom, #070707);
+        color: #7f7f7f;
+        border-color: #7f7f7f;
+        background-image: linear-gradient(to bottom, #060606);
         box-shadow: none;
         border-bottom-color: #2e2e2e; }
         .linked.vertical entry:first-child:disabled:backdrop, .linked.vertical spinbutton:first-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #090909, #111 90%);
-          color: gray;
+          color: #7f7f7f;
           background-image: linear-gradient(to bottom, #000);
           box-shadow: 0 1px rgba(255, 255, 255, 0);
           border-bottom-color: #2e2e2e;
@@ -279,8 +279,8 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      border-color: gray;
-      box-shadow: inset 0 2px 2px -2px #090909;
+      border-color: #7f7f7f;
+      box-shadow: inset 0 2px 2px -2px #080808;
       border-top-width: 0;
       background-image: linear-gradient(to bottom, #111);
       box-shadow: none; }
@@ -291,15 +291,15 @@ entry, spinbutton {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: gray;
-        border-color: gray;
-        background-image: linear-gradient(to bottom, #070707);
+        color: #7f7f7f;
+        border-color: #7f7f7f;
+        background-image: linear-gradient(to bottom, #060606);
         box-shadow: none; }
         .linked.vertical entry:last-child:disabled:backdrop, .linked.vertical spinbutton:last-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #090909, #111 90%);
-          color: gray;
+          color: #7f7f7f;
           background-image: linear-gradient(to bottom, #000);
           box-shadow: 0 1px rgba(255, 255, 255, 0); }
       .linked.vertical entry:last-child:backdrop, .linked.vertical spinbutton:last-child:backdrop {
@@ -317,7 +317,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
       border-color: #cc0000;
-      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #360e0e; }
+      box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #360d0d; }
     entry.error:selected, entry.error:selected:focus, spinbutton.error:selected, spinbutton.error:selected:focus {
       background-color: #cc0000; }
   entry.warning, spinbutton.warning {
@@ -328,7 +328,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
       border-color: #f57900;
-      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #3f260e; }
+      box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #3e250d; }
     entry.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected, spinbutton.warning:selected:focus {
       background-color: #f57900; }
 
@@ -349,13 +349,13 @@ button {
   color: #fff;
   background-image: none;
   background-color: #000;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   button:hover, button.flat:hover, button.sidebar-button:hover {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none;
     -gtk-icon-effect: highlight; }
   button:active, button.flat:active, button.sidebar-button:active, button:checked, button.flat:checked, button.sidebar-button:checked {
@@ -364,14 +364,14 @@ button {
     background-image: none;
     color: black;
     background-color: white;
-    border-color: gray;
+    border-color: #7f7f7f;
     transition-duration: 50ms; }
   button:backdrop, button.flat:backdrop, button.sidebar-button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #737373;
+    border-color: #727272;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -379,39 +379,39 @@ button {
       border-width: 2px;
       border-style: solid;
       color: black;
-      background-color: #737373;
-      border-color: #737373;
+      background-color: #727272;
+      border-color: #727272;
       background-image: none; }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: #737373;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #727272;
       background-image: none; }
     button:backdrop:disabled:active, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      border-color: #737373;
+      color: #7f7f7f;
+      border-color: #727272;
       background-image: none;
       background-color: #090909; }
   button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    background-color: #070707;
-    border-color: gray;
+    color: #7f7f7f;
+    background-color: #060606;
+    border-color: #7f7f7f;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
     button:disabled:active, button:disabled.flat:active, button.sidebar-button:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      border-color: gray;
+      color: #7f7f7f;
+      border-color: #7f7f7f;
       background-image: none;
-      background-color: #070707; }
+      background-color: #060606; }
   .osd button {
     padding: 6px;
     border-width: 1px 1px 2px 1px;
@@ -440,7 +440,7 @@ button {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: gray; }
+      color: #7f7f7f; }
     .osd button:backdrop {
       border-width: 2px;
       border-style: solid; }
@@ -477,16 +477,16 @@ button {
       button.suggested-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: #737373;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #727272;
         background-image: none; }
     button.suggested-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -523,16 +523,16 @@ button {
       button.destructive-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: #737373;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #727272;
         background-image: none; }
     button.destructive-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -552,13 +552,13 @@ button {
   color: #fff;
   background-image: none;
   background-color: #000;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   .inline-toolbar toolbutton > button:hover {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none; }
   .inline-toolbar toolbutton > button:active {
     border-width: 2px;
@@ -566,29 +566,29 @@ button {
     background-image: none;
     color: black;
     background-color: white;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   .inline-toolbar toolbutton > button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    background-color: #070707;
-    border-color: gray;
+    color: #7f7f7f;
+    background-color: #060606;
+    border-color: #7f7f7f;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    border-color: gray;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
     background-image: none;
-    background-color: #070707; }
+    background-color: #060606; }
   .inline-toolbar toolbutton > button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #737373;
+    border-color: #727272;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -596,21 +596,21 @@ button {
     border-width: 2px;
     border-style: solid;
     color: black;
-    background-color: #737373;
-    border-color: #737373;
+    background-color: #727272;
+    border-color: #727272;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    background-color: #070707;
-    border-color: #737373;
+    color: #7f7f7f;
+    background-color: #060606;
+    border-color: #727272;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    border-color: #737373;
+    color: #7f7f7f;
+    border-color: #727272;
     background-image: none;
     background-color: #090909; }
 
@@ -702,7 +702,7 @@ modelbutton.flat,
       background-color: #aaa; }
   modelbutton.flat:disabled,
   .menuitem.button.flat:disabled {
-    color: gray; }
+    color: #7f7f7f; }
 
 button.color {
   padding: 4px; }
@@ -745,7 +745,7 @@ spinbutton {
    */ }
   spinbutton button {
     background-image: none;
-    border-color: rgba(128, 128, 128, 0.3);
+    border-color: rgba(127, 127, 127, 0.3);
     color: #f3f3f3;
     border-radius: 0; }
     spinbutton button:dir(ltr) {
@@ -761,7 +761,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:disabled {
       box-shadow: none;
-      color: rgba(128, 128, 128, 0.3); }
+      color: rgba(127, 127, 127, 0.3); }
       spinbutton button:disabled:dir(ltr) {
         border-style: none none none solid; }
       spinbutton button:disabled:dir(rtl) {
@@ -770,7 +770,7 @@ spinbutton {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     spinbutton button:backdrop {
-      border-color: rgba(115, 115, 115, 0.3);
+      border-color: rgba(114, 114, 114, 0.3);
       background-color: #000;
       box-shadow: none; }
       spinbutton button:backdrop:dir(ltr) {
@@ -779,7 +779,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:backdrop:disabled {
       box-shadow: none;
-      color: rgba(128, 128, 128, 0.3); }
+      color: rgba(127, 127, 127, 0.3); }
       spinbutton button:backdrop:disabled:dir(rtl) {
         border-width: 0 1px 0 0; }
       spinbutton button:backdrop:disabled:dir(ltr) {
@@ -792,27 +792,27 @@ spinbutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     spinbutton.vertical button:first-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: black;
       background-color: white;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     spinbutton.vertical button:first-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     spinbutton.vertical button:first-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -821,7 +821,7 @@ spinbutton {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #737373;
+      border-color: #727272;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -831,27 +831,27 @@ spinbutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     spinbutton.vertical button:last-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: black;
       background-color: white;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     spinbutton.vertical button:last-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     spinbutton.vertical button:last-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -860,16 +860,16 @@ spinbutton {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #737373;
+      border-color: #727272;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
   spinbutton.vertical button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    background-color: #070707;
-    border-color: #737373;
+    color: #7f7f7f;
+    background-color: #060606;
+    border-color: #727272;
     background-image: none; }
   spinbutton.vertical.entry {
     border-radius: 0; }
@@ -890,7 +890,7 @@ combobox {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: gray;
+    color: #7f7f7f;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
@@ -898,7 +898,7 @@ combobox {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
-    color: gray; }
+    color: #7f7f7f; }
   combobox arrow {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
     min-height: 16px;
@@ -935,25 +935,25 @@ toolbar, searchbar {
     padding: 3px;
     border-radius: 0  0 4px 4px; }
   toolbar.vertical, searchbar.vertical {
-    border-right: 1px solid gray; }
+    border-right: 1px solid #7f7f7f; }
     toolbar.vertical:dir(rtl), searchbar.vertical:dir(rtl) {
       border-right: none;
-      border-left: 1px solid gray; }
+      border-left: 1px solid #7f7f7f; }
 
 searchbar {
   border-width: 0 0 1px;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-style: none none solid none;
   padding: 3px; }
 
 toolbar.inline-toolbar, searchbar.inline-toolbar {
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   background-color: #262626;
-  box-shadow: inset 0 2px 3px -1px #5c5c5c; }
+  box-shadow: inset 0 2px 3px -1px #5b5b5b; }
   toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop {
-    border-color: #737373;
-    background-color: #282828;
+    border-color: #727272;
+    background-color: #272727;
     box-shadow: none; }
 
 /***************
@@ -963,7 +963,7 @@ toolbar.inline-toolbar, searchbar.inline-toolbar {
 headerbar {
   border-width: 0 0 1px;
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #0a0a0a, #000);
@@ -971,7 +971,7 @@ headerbar {
   padding: 6px; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: #737373;
+    border-color: #727272;
     background-color: #000;
     background-image: none;
     box-shadow: none; }
@@ -1026,9 +1026,9 @@ headerbar {
       headerbar.selection-mode button:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: gray;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -1047,9 +1047,9 @@ headerbar {
       headerbar.selection-mode button:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: #737373;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #727272;
         background-image: none; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1058,14 +1058,14 @@ headerbar {
         color: #fff;
         background-image: none;
         background-color: #000;
-        border-color: gray; }
+        border-color: #7f7f7f; }
         .titlebar.selection-mode button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
           border-width: 2px;
           border-style: solid;
           color: #fff;
           background-color: #000;
-          border-color: gray;
+          border-color: #7f7f7f;
           background-image: none; }
         .titlebar.selection-mode button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1074,14 +1074,14 @@ headerbar {
           background-image: none;
           color: black;
           background-color: white;
-          border-color: gray; }
+          border-color: #7f7f7f; }
         .titlebar.selection-mode button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
-          background-color: #070707;
-          border-color: gray;
+          color: #7f7f7f;
+          background-color: #060606;
+          border-color: #7f7f7f;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1091,7 +1091,7 @@ headerbar {
           border-style: solid;
           color: #fff;
           background-color: #000;
-          border-color: #737373;
+          border-color: #727272;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1099,9 +1099,9 @@ headerbar {
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
-          background-color: #070707;
-          border-color: #737373;
+          color: #7f7f7f;
+          background-color: #060606;
+          border-color: #727272;
           background-image: none; }
     .titlebar.selection-mode .selection-menu,
     headerbar.selection-mode .selection-menu {
@@ -1149,44 +1149,44 @@ treeview.view {
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #d5d5d5;
+    border-left-color: #d4d4d4;
     border-top-color: rgba(255, 255, 255, 0.1); }
   treeview.view:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     treeview.view:disabled:selected {
       color: #cccccc; }
       treeview.view:disabled:selected:backdrop {
-        color: #d5d5d5; }
+        color: #d4d4d4; }
     treeview.view:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   treeview.view.separator:backdrop {
     min-height: 2px;
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
     color: #fff;
-    border-left-color: gray;
+    border-left-color: #7f7f7f;
     border-top: #000; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #d5d5d5; }
+    border-color: #d4d4d4; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #b8b8b8; }
+    color: #b7b7b7; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #fff; }
     treeview.view.expander:selected {
-      color: #e6e6e6; }
+      color: #e5e5e5; }
       treeview.view.expander:selected:hover {
         color: #fff; }
       treeview.view.expander:selected:backdrop {
-        color: #e6e6e6; }
+        color: #e5e5e5; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #b8b8b8; }
+      color: #b7b7b7; }
   treeview.view.progressbar {
     color: #111;
     border: 1px solid #aaa;
@@ -1212,7 +1212,7 @@ treeview.view {
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #c4c4c4;
+      color: #c3c3c3;
       box-shadow: none; }
     treeview.view header button:active {
       color: #fff; }
@@ -1225,15 +1225,15 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   border-radius: 0;
   border-width: 1px;
   background-image: none;
-  border-color: gray;
+  border-color: #7f7f7f;
   text-shadow: none; }
   treeview.view header button:disabled {
     border-color: #000;
     background-image: none; }
   treeview.view header button:backdrop {
-    border-color: gray;
+    border-color: #7f7f7f;
     border-style: none solid solid none;
-    color: gray;
+    color: #7f7f7f;
     background-image: none;
     background-color: #111; }
     treeview.view header button:backdrop:disabled {
@@ -1243,7 +1243,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
 treeview.view.progressbar {
   color: #111;
   border-radius: 4px;
-  background-image: linear-gradient(to bottom, #aaa, #919191); }
+  background-image: linear-gradient(to bottom, #aaa, #909090); }
   treeview.view.progressbar:selected {
     color: #aaa;
     background-image: linear-gradient(to bottom, #111, black); }
@@ -1270,7 +1270,7 @@ menubar,
       color: #aaa; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: gray;
+      color: #7f7f7f;
       box-shadow: none; }
 
 menu,
@@ -1278,7 +1278,7 @@ menu,
   margin: 4px;
   padding: 0px;
   background-color: #111;
-  border: 1px solid gray; }
+  border: 1px solid #7f7f7f; }
   menu menuitem,
   .menu menuitem {
     text-shadow: none;
@@ -1290,10 +1290,10 @@ menu,
       background-color: #aaa; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
@@ -1326,7 +1326,7 @@ menuitem check, menuitem radio {
 popover {
   margin: 10px;
   padding: 2px;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-width: 1px;
   border-style: solid;
   border-radius: 5px;
@@ -1357,7 +1357,7 @@ popover {
   popover.magnifier, popover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
-    border: 1px solid gray;
+    border: 1px solid #7f7f7f;
     color: #fff; }
     popover.magnifier button, popover.osd button {
       color: white;
@@ -1387,7 +1387,7 @@ popover {
         border-width: 2px;
         border-style: solid;
         border-color: rgba(255, 255, 255, 0.2);
-        color: gray; }
+        color: #7f7f7f; }
 
 /*****************
  * Notebooks and *
@@ -1400,13 +1400,13 @@ notebook {
   notebook:backdrop {
     background-color: #111; }
   notebook.frame {
-    border: 1px solid gray; }
+    border: 1px solid #7f7f7f; }
     notebook.frame:backdrop {
-      border-color: #737373; }
+      border-color: #727272; }
   notebook header {
     background-color: #262626; }
     .frame notebook header {
-      border: 1px solid gray; }
+      border: 1px solid #7f7f7f; }
       .frame notebook header.top {
         border-bottom-width: 0; }
       .frame notebook header.bottom {
@@ -1416,34 +1416,34 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #737373; }
+        border-color: #727272; }
     notebook header.top {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #7f7f7f; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #737373; }
+        box-shadow: inset 0 -1px #727272; }
     notebook header.bottom {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #7f7f7f; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #737373; }
+        box-shadow: inset 0 1px #727272; }
     notebook header.right {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #7f7f7f; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #737373; }
+        box-shadow: inset 1px 0 #727272; }
     notebook header.left {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #7f7f7f; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #737373; }
+        box-shadow: inset -1px 0 #727272; }
     notebook header:backdrop {
-      background-color: #282828;
+      background-color: #272727;
       box-shadow: none; }
     notebook header tabs arrow {
-      color: gray; }
+      color: #7f7f7f; }
       notebook header tabs arrow:hover {
-        color: silver; }
-      notebook header tabs arrow:active {
+        color: #bfbfbf; }
+      notebook header tabs arrow:checked {
         color: #fff; }
       notebook header tabs arrow:disabled {
-        color: rgba(128, 128, 128, 0.3); }
+        color: rgba(127, 127, 127, 0.3); }
       notebook header tabs arrow:backdrop {
         color: rgba(255, 255, 255, 0.4); }
   notebook header.top tab {
@@ -1481,8 +1481,8 @@ notebook {
     background-color: transparent;
     outline-offset: 0; }
     notebook tab:hover {
-      border-color: gray; }
-    notebook tab:active, notebook tab:backdrop:active {
+      border-color: #7f7f7f; }
+    notebook tab:checked, notebook tab:backdrop:checked {
       border-color: #aaa; }
     notebook tab:backdrop {
       background-color: transparent;
@@ -1490,17 +1490,17 @@ notebook {
     .top notebook tab.reorderable-page {
       border-color: transparent; }
       .top notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-bottom-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-bottom-color: #7f7f7f;
         background-color: rgba(0, 0, 0, 0.2); }
-      .top notebook tab.reorderable-page:active {
+      .top notebook tab.reorderable-page:checked {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-bottom-color: #aaa; }
-        .top notebook tab.reorderable-page:active:hover {
+        .top notebook tab.reorderable-page:checked:hover {
           background-color: rgba(0, 0, 0, 0.7); }
-        .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #737373;
+        .top notebook tab.reorderable-page:checked:backdrop {
+          border-color: #727272;
           background-color: #000;
           border-bottom-color: #aaa; }
       .top notebook tab.reorderable-page:backdrop {
@@ -1509,17 +1509,17 @@ notebook {
     .bottom notebook tab.reorderable-page {
       border-color: transparent; }
       .bottom notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-top-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-top-color: #7f7f7f;
         background-color: rgba(0, 0, 0, 0.2); }
-      .bottom notebook tab.reorderable-page:active {
+      .bottom notebook tab.reorderable-page:checked {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-top-color: #aaa; }
-        .bottom notebook tab.reorderable-page:active:hover {
+        .bottom notebook tab.reorderable-page:checked:hover {
           background-color: rgba(0, 0, 0, 0.7); }
-        .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #737373;
+        .bottom notebook tab.reorderable-page:checked:backdrop {
+          border-color: #727272;
           background-color: #000;
           border-top-color: #aaa; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -1528,17 +1528,17 @@ notebook {
     .left notebook tab.reorderable-page {
       border-color: transparent; }
       .left notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-right-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-right-color: #7f7f7f;
         background-color: rgba(0, 0, 0, 0.2); }
-      .left notebook tab.reorderable-page:active {
+      .left notebook tab.reorderable-page:checked {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-right-color: #aaa; }
-        .left notebook tab.reorderable-page:active:hover {
+        .left notebook tab.reorderable-page:checked:hover {
           background-color: rgba(0, 0, 0, 0.7); }
-        .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #737373;
+        .left notebook tab.reorderable-page:checked:backdrop {
+          border-color: #727272;
           background-color: #000;
           border-right-color: #aaa; }
       .left notebook tab.reorderable-page:backdrop {
@@ -1547,17 +1547,17 @@ notebook {
     .right notebook tab.reorderable-page {
       border-color: transparent; }
       .right notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-left-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-left-color: #7f7f7f;
         background-color: rgba(0, 0, 0, 0.2); }
-      .right notebook tab.reorderable-page:active {
+      .right notebook tab.reorderable-page:checked {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-left-color: #aaa; }
-        .right notebook tab.reorderable-page:active:hover {
+        .right notebook tab.reorderable-page:checked:hover {
           background-color: rgba(0, 0, 0, 0.7); }
-        .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #737373;
+        .right notebook tab.reorderable-page:checked:backdrop {
+          border-color: #727272;
           background-color: #000;
           border-left-color: #aaa; }
       .right notebook tab.reorderable-page:backdrop {
@@ -1566,15 +1566,15 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: gray;
+      color: #7f7f7f;
       /* color: inherit doesn't work here */ }
       notebook tab label:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     notebook tab:hover label {
-      color: silver; }
-    notebook tab:active label {
+      color: #bfbfbf; }
+    notebook tab:checked label {
       color: #fff; }
-      notebook tab:active label:backdrop {
+      notebook tab:checked label:backdrop {
         color: #fff; }
     notebook tab button {
       border: 2px solid transparent;
@@ -1587,18 +1587,18 @@ notebook {
         border-style: solid;
         color: #fff;
         background-color: #000;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         border-width: 2px;
         background-image: none;
         box-shadow: none; }
-      notebook tab button:active {
+      notebook tab button:checked {
         border-width: 2px;
         border-style: solid;
         background-image: none;
         color: black;
         background-color: white;
-        border-color: gray;
+        border-color: #7f7f7f;
         border-width: 2px; }
       notebook tab button:backdrop, notebook tab button:backdrop:hover {
         color: rgba(255, 255, 255, 0.3);
@@ -1626,11 +1626,11 @@ scrollbar {
   scrollbar slider {
     border-radius: 20px;
     border: 5px solid transparent;
-    background-color: gray; }
+    background-color: #7f7f7f; }
     scrollbar slider:backdrop, scrollbar slider:disabled {
-      background-color: #1a1a1a; }
+      background-color: #191919; }
     scrollbar slider:hover {
-      background-color: #b3b3b3; }
+      background-color: #b2b2b2; }
     scrollbar slider:hover:active {
       background-color: #aaa; }
     scrollbar slider.fine-tune {
@@ -1666,8 +1666,8 @@ switch {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
-  border-color: gray;
-  background-color: #333333;
+  border-color: #7f7f7f;
+  background-color: #323232;
   box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
   /*outset not working*/
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
@@ -1677,25 +1677,25 @@ switch {
     background-color: #aaa;
     text-shadow: 0 0 2px white; }
   switch:disabled {
-    color: gray;
-    border-color: gray;
-    background-color: #070707;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
+    background-color: #060606;
     text-shadow: none; }
   switch:backdrop {
     color: #fff;
-    border-color: #737373;
+    border-color: #727272;
     background-color: #000;
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
       color: #fff;
-      border-color: #737373;
-      background-color: #737373;
+      border-color: #727272;
+      background-color: #727272;
       box-shadow: none; }
     switch:backdrop:disabled, switch:backdrop:disabled:active {
-      background-color: #070707;
-      color: gray;
-      border-color: gray; }
+      background-color: #060606;
+      color: #7f7f7f;
+      border-color: #7f7f7f; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -1707,24 +1707,24 @@ switch {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray;
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #404040; }
+    border-color: #7f7f7f;
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #3f3f3f; }
     switch slider:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
-      box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #404040; }
+      box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #3f3f3f; }
     switch slider:active {
       border-color: #aaa; }
     switch slider:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -1733,18 +1733,18 @@ switch {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #737373;
+      border-color: #727272;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
       switch slider:backdrop:active {
-        border-color: #737373; }
+        border-color: #727272; }
       switch slider:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: #737373;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #727272;
         background-image: none; }
 
 /*************************
@@ -1763,15 +1763,15 @@ check {
   check:checked, check:active {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
     check:checked:disabled, check:active:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       check:checked:disabled:backdrop, check:active:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     check:checked:backdrop, check:active:backdrop {
       color: #fff; }
   check:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     check:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   check:indeterminate {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
   check:backdrop {
@@ -1788,15 +1788,15 @@ radio {
   radio:checked, radio:active {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
     radio:checked:disabled, radio:active:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       radio:checked:disabled:backdrop, radio:active:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     radio:checked:backdrop, radio:active:backdrop {
       color: #fff; }
   radio:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     radio:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   radio:indeterminate {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
   radio:backdrop {
@@ -1842,9 +1842,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray;
+    border-color: #7f7f7f;
     border-radius: 50%;
-    border-color: #787878; }
+    border-color: #777777; }
     scale trough slider:hover,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:hover,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:hover {
@@ -1852,9 +1852,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
-      border-color: #787878;
+      border-color: #777777;
       border-radius: 50%; }
     scale trough slider:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:disabled,
@@ -1868,7 +1868,7 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #6b6b6b;
+      border-color: #6a6a6a;
       background-image: none;
       box-shadow: none; }
     scale trough slider:backdrop:disabled,
@@ -1876,9 +1876,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: #737373;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #727272;
       background-image: none; }
     scale trough slider:active,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
@@ -1891,8 +1891,8 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: gray;
-    background-color: #333333;
+    border-color: #7f7f7f;
+    background-color: #323232;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     scale trough.highlight,
     scale.scale-has-marks-above.scale-has-marks-below trough.highlight,
@@ -1902,28 +1902,28 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       scale trough.highlight:backdrop,
       scale.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop,
       scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop {
-        border-color: gray;
-        background-color: gray;
+        border-color: #7f7f7f;
+        background-color: #7f7f7f;
         box-shadow: none; }
     scale trough:disabled, scale trough.hilight:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled {
-      border-color: gray;
-      background-color: #070707; }
+      border-color: #7f7f7f;
+      background-color: #060606; }
     scale trough:backdrop,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop {
-      border-color: #737373;
-      background-color: #404040;
+      border-color: #727272;
+      background-color: #3f3f3f;
       box-shadow: none; }
     scale trough:backdrop:disabled, scale trough .hilight:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled {
-      border-color: gray;
+      border-color: #7f7f7f;
       background-color: #000; }
 
 /*****************
@@ -1934,17 +1934,17 @@ progressbar {
   font-size: 83%;
   color: #fff; }
   progressbar:backdrop {
-    color: gray; }
+    color: #7f7f7f; }
   progressbar trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: gray;
-    background-color: #2d2d2d;
+    border-color: #7f7f7f;
+    background-color: #2c2c2c;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     progressbar trough:backdrop {
-      border-color: #737373;
-      background-color: #282828;
+      border-color: #727272;
+      background-color: #272727;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   progressbar.osd trough {
     background-color: transparent;
@@ -1981,8 +1981,8 @@ levelbar trough {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #090909, #111 90%);
-  border-color: gray;
-  box-shadow: inset 0 2px 2px -2px #090909; }
+  border-color: #7f7f7f;
+  box-shadow: inset 0 2px 2px -2px #080808; }
   levelbar trough:backdrop {
     background-color: transparent;
     border-style: solid;
@@ -2008,7 +2008,7 @@ levelbar block.filled.low {
 levelbar block.filled.high {
   border-width: 1px;
   border-style: solid;
-  border-color: #919191;
+  border-color: #909090;
   background-color: #aaa;
   box-shadow: 0 1px rgba(0, 0, 0, 0.1);
   border-radius: 1px; }
@@ -2049,7 +2049,7 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
   spinbutton selection:backdrop:focus, modelbutton.flat:backdrop:hover, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:hover,
   .menuitem.button.flat:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected {
-    background-color: gray;
+    background-color: #7f7f7f;
     color: #fff; }
 
 /**********
@@ -2057,19 +2057,19 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
  **********/
 frame border,
 .frame {
-  border: 1px solid gray;
+  border: 1px solid #7f7f7f;
   padding: 0; }
   frame border.flat,
   .frame.flat {
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #737373; }
+    border-color: #727272; }
 
 actionbar box {
   padding: 6px;
   border-width: 1px 0 0;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-style: solid none none; }
 
 placessidebar .frame,
@@ -2080,7 +2080,7 @@ scrolledwindow viewport.frame {
   border-style: none; }
 placessidebar overshoot.top,
 scrolledwindow overshoot.top {
-  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center top;
@@ -2089,7 +2089,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -2098,7 +2098,7 @@ scrolledwindow overshoot.top {
     box-shadow: none; }
 placessidebar overshoot.bottom,
 scrolledwindow overshoot.bottom {
-  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center bottom;
@@ -2107,7 +2107,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -2116,7 +2116,7 @@ scrolledwindow overshoot.bottom {
     box-shadow: none; }
 placessidebar overshoot.left,
 scrolledwindow overshoot.left {
-  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: left center;
@@ -2125,7 +2125,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -2134,7 +2134,7 @@ scrolledwindow overshoot.left {
     box-shadow: none; }
 placessidebar overshoot.right,
 scrolledwindow overshoot.right {
-  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: right center;
@@ -2143,7 +2143,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -2211,7 +2211,7 @@ placessidebar .view separator:backdrop,
 placessidebar textview text separator:backdrop,
 textview placessidebar text separator:backdrop,
 placessidebar iconview separator:backdrop {
-  background: gray;
+  background: #7f7f7f;
   min-width: 1px;
   min-height: 1px; }
 
@@ -2220,10 +2220,10 @@ placessidebar iconview separator:backdrop {
  *********/
 list {
   background-color: #111;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   list:backdrop {
     background-color: #111;
-    border-color: #737373; }
+    border-color: #727272; }
   list row {
     padding: 2px; }
 
@@ -2244,7 +2244,7 @@ row.activatable:disabled:checked {
 row.activatable {
   color: #fff; }
   row.activatable:hover, placessidebar .has-open-popup {
-    background-color: #1d1d1d; }
+    background-color: #1c1c1c; }
   row.activatable:active {
     box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
   row.activatable:selected {
@@ -2253,9 +2253,9 @@ row.activatable {
     row.activatable:selected:active {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
     row.activatable:selected:hover, placessidebar .has-open-popup:selected {
-      background-color: #b3b3b3; }
+      background-color: #b2b2b2; }
     row.activatable:selected:backdrop {
-      background-color: gray; }
+      background-color: #7f7f7f; }
     row.activatable:selected .button.flat {
       color: #fff; }
       row.activatable:selected .button.flat:hover {
@@ -2283,7 +2283,7 @@ row.activatable {
   padding: 10px;
   border-width: 0 1px 1px;
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-radius: 0 0 6px 6px;
   background-image: linear-gradient(to bottom, black 5%, black); }
   .app-notification .button,
@@ -2308,7 +2308,7 @@ expander arrow {
  * Calendar *
  ***********/
 calendar {
-  border: 1px solid gray; }
+  border: 1px solid #7f7f7f; }
   calendar.button {
     padding: 0 4px;
     color: #707070; }
@@ -2320,10 +2320,10 @@ calendar {
     border-radius: 2px; }
   calendar.header {
     background: linear-gradient(to bottom, #050505, black);
-    border-bottom-color: #404040; }
+    border-bottom-color: #3f3f3f; }
     calendar.header:backdrop {
       background-image: linear-gradient(to bottom, #000);
-      border-bottom-color: #3a3a3a; }
+      border-bottom-color: #393939; }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
@@ -2349,13 +2349,13 @@ messagedialog.csd {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     messagedialog.csd .dialog-action-area button:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     messagedialog.csd .dialog-action-area button:active {
       border-width: 2px;
@@ -2363,13 +2363,13 @@ messagedialog.csd {
       background-image: none;
       color: black;
       background-color: white;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     messagedialog.csd .dialog-action-area button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2378,16 +2378,16 @@ messagedialog.csd {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #737373;
+      border-color: #727272;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     messagedialog.csd .dialog-action-area button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: #737373;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #727272;
       background-image: none; }
     messagedialog.csd .dialog-action-area button.suggested-action {
       border-width: 2px;
@@ -2422,16 +2422,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
-          background-color: #070707;
-          border-color: #737373;
+          color: #7f7f7f;
+          background-color: #060606;
+          border-color: #727272;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.suggested-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: gray;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2468,16 +2468,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
-          background-color: #070707;
-          border-color: #737373;
+          color: #7f7f7f;
+          background-color: #060606;
+          border-color: #727272;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.destructive-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: gray;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2491,9 +2491,9 @@ messagedialog.csd {
     border-bottom-left-radius: 7px; }
 
 GtkFileChooserDialog .dialog-action-box {
-  border-top: 1px solid gray; }
+  border-top: 1px solid #7f7f7f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #737373; }
+    border-top-color: #727272; }
 
 /***********
  * Sidebar *
@@ -2503,10 +2503,10 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #000; }
   .sidebar > scrolledwindow > .frame {
-    border-right: 1px solid gray; }
+    border-right: 1px solid #7f7f7f; }
     .sidebar > scrolledwindow > .frame:dir(rtl) {
       border-right: none;
-      border-left: 1px solid gray; }
+      border-left: 1px solid #7f7f7f; }
 
 placessidebar row {
   padding: 0px; }
@@ -2533,9 +2533,9 @@ placessidebar .view, placessidebar textview text, textview placessidebar text, p
   color: #fff;
   background-color: transparent; }
   placessidebar .view .image, placessidebar textview text .image, textview placessidebar text .image, placessidebar iconview .image {
-    color: #b3b3b3; }
+    color: #b2b2b2; }
     placessidebar .view .image:selected, placessidebar textview text .image:selected, textview placessidebar text .image:selected, placessidebar iconview .image:selected {
-      color: #f7f7f7; }
+      color: #f6f6f6; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2559,9 +2559,9 @@ paned placessidebar iconview separator:backdrop,
 placessidebar iconview paned separator:backdrop {
   min-width: 1px;
   min-height: 1px;
-  background-image: linear-gradient(to bottom, gray); }
+  background-image: linear-gradient(to bottom, #7f7f7f); }
   paned separator:backdrop {
-    background-image: linear-gradient(to bottom, #737373); }
+    background-image: linear-gradient(to bottom, #727272); }
 paned:dir(ltr).horizontal separator {
   margin: 0 -8px 0 0;
   padding: 0 8px 0 0; }
@@ -2602,7 +2602,7 @@ placessidebar iconview paned separator.wide:backdrop {
   min-height: 5px;
   background-color: transparent;
   border-style: none solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-width: 1px; }
 
 /**************
@@ -2618,8 +2618,8 @@ infobar {
 .error {
   background-color: #aaa;
   color: #fff;
-  text-shadow: 0 1px #919191;
-  border-color: #919191; }
+  text-shadow: 0 1px #909090;
+  border-color: #909090; }
   .info button,
   .question button,
   .warning button,
@@ -2656,9 +2656,9 @@ infobar {
     .error button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2680,9 +2680,9 @@ infobar {
     .error button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: #737373;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #727272;
       background-image: none; }
   .info label:selected,
   .info label:selected:focus,
@@ -2784,20 +2784,20 @@ colorswatch {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     colorswatch#add-color-button:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     colorswatch#add-color-button:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #737373;
+      border-color: #727272;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2828,7 +2828,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #000;
-    border: solid 1px #737373;
+    border: solid 1px #727272;
     box-shadow: none; }
 
 button.titlebutton {
@@ -2843,20 +2843,20 @@ button.titlebutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   button.titlebutton:active {
     border-width: 2px;
     border-style: solid;
     background-image: none;
     color: black;
     background-color: white;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   button.titlebutton:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #737373;
+    border-color: #727272;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2941,7 +2941,7 @@ cursor-handle {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: gray; }
+      color: #7f7f7f; }
     .touch-selection button:backdrop {
       border-width: 2px;
       border-style: solid; }
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 590f31d02f..31279b45aa 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -5,15 +5,15 @@
 @define-color theme_selected_bg_color #000;
 @define-color theme_selected_fg_color #fff;
 @define-color insensitive_bg_color white;
-@define-color insensitive_fg_color gray;
+@define-color insensitive_fg_color #7f7f7f;
 @define-color insensitive_base_color #fff;
 @define-color theme_unfocused_fg_color #000;
 @define-color theme_unfocused_bg_color #fff;
 @define-color theme_unfocused_base_color #fff;
 @define-color theme_unfocused_selected_bg_color #000;
 @define-color theme_unfocused_selected_fg_color #fff;
-@define-color borders gray;
-@define-color unfocused_borders #8d8d8d;
+@define-color borders #7f7f7f;
+@define-color unfocused_borders #8b8b8b;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #73d216;
@@ -80,7 +80,7 @@
     color: #000; }
   .gtkstyle-fallback:disabled {
     background-color: white;
-    color: gray; }
+    color: #7f7f7f; }
   .gtkstyle-fallback:selected {
     background-color: #000;
     color: #fff; }
@@ -106,7 +106,7 @@ flowbox flowboxchild {
     outline-offset: -2px; }
 
 label:disabled, label:backdrop:disabled {
-  color: gray; }
+  color: #7f7f7f; }
 
 /*********************
  * Spinner Animation *
@@ -135,15 +135,15 @@ entry, spinbutton {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-  border-color: gray;
-  box-shadow: inset 0 2px 2px -2px gray; }
+  border-color: #7f7f7f;
+  box-shadow: inset 0 2px 2px -2px #7f7f7f; }
   entry.flat, entry.flat:focus, spinbutton.flat, spinbutton.flat:focus {
     padding: 2px;
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    border-color: gray;
-    box-shadow: inset 0 2px 2px -2px gray;
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #7f7f7f;
     border: none;
     border-radius: 0; }
   entry:focus, spinbutton:focus {
@@ -151,13 +151,13 @@ entry, spinbutton {
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
     border-color: #000;
-    box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; }
+    box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #cccccc; }
   entry:disabled, spinbutton:disabled {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    color: gray;
-    border-color: gray;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
     background-image: linear-gradient(to bottom, white);
     box-shadow: none; }
   entry:backdrop, spinbutton:backdrop {
@@ -171,7 +171,7 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    color: gray;
+    color: #7f7f7f;
     background-image: linear-gradient(to bottom, #fff);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry selection, entry selection:backdrop, spinbutton selection, spinbutton selection:backdrop {
@@ -203,10 +203,10 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    border-color: gray;
-    box-shadow: inset 0 2px 2px -2px gray;
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #7f7f7f;
     background-image: linear-gradient(to bottom, #fff);
-    border-bottom-color: #d9d9d9;
+    border-bottom-color: #d8d8d8;
     box-shadow: none; }
     .linked.vertical entry:focus, .linked.vertical spinbutton:focus {
       border-color: #000;
@@ -215,19 +215,19 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      color: gray;
-      border-color: gray;
+      color: #7f7f7f;
+      border-color: #7f7f7f;
       background-image: linear-gradient(to bottom, white);
       box-shadow: none;
-      border-bottom-color: #d9d9d9; }
+      border-bottom-color: #d8d8d8; }
       .linked.vertical entry:disabled:backdrop, .linked.vertical spinbutton:disabled:backdrop {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: gray;
+        color: #7f7f7f;
         background-image: linear-gradient(to bottom, #fff);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
-        border-bottom-color: #dddddd; }
+        border-bottom-color: gainsboro; }
     .linked.vertical entry:backdrop, .linked.vertical spinbutton:backdrop {
       background-color: transparent;
       border-style: solid;
@@ -235,37 +235,37 @@ entry, spinbutton {
       color: #000;
       background-image: linear-gradient(to bottom, #fff);
       box-shadow: 0 1px rgba(255, 255, 255, 0);
-      border-bottom-color: #dddddd; }
+      border-bottom-color: gainsboro; }
     .linked.vertical entry:first-child, .linked.vertical spinbutton:first-child {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      border-color: gray;
-      box-shadow: inset 0 2px 2px -2px gray;
-      border-bottom-color: #d9d9d9; }
+      border-color: #7f7f7f;
+      box-shadow: inset 0 2px 2px -2px #7f7f7f;
+      border-bottom-color: #d8d8d8; }
       .linked.vertical entry:first-child:focus, .linked.vertical spinbutton:first-child:focus {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
         border-color: #000;
-        box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; }
+        box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #cccccc; }
       .linked.vertical entry:first-child:disabled, .linked.vertical spinbutton:first-child:disabled {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: gray;
-        border-color: gray;
+        color: #7f7f7f;
+        border-color: #7f7f7f;
         background-image: linear-gradient(to bottom, white);
         box-shadow: none;
-        border-bottom-color: #dddddd; }
+        border-bottom-color: gainsboro; }
         .linked.vertical entry:first-child:disabled:backdrop, .linked.vertical spinbutton:first-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: gray;
+          color: #7f7f7f;
           background-image: linear-gradient(to bottom, #fff);
           box-shadow: 0 1px rgba(255, 255, 255, 0);
-          border-bottom-color: #dddddd;
+          border-bottom-color: gainsboro;
           border-top-style: solid; }
       .linked.vertical entry:first-child:backdrop, .linked.vertical spinbutton:first-child:backdrop {
         background-color: transparent;
@@ -274,13 +274,13 @@ entry, spinbutton {
         color: #000;
         background-image: linear-gradient(to bottom, #fff);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
-        border-bottom-color: #dddddd; }
+        border-bottom-color: gainsboro; }
     .linked.vertical entry:last-child, .linked.vertical spinbutton:last-child {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      border-color: gray;
-      box-shadow: inset 0 2px 2px -2px gray;
+      border-color: #7f7f7f;
+      box-shadow: inset 0 2px 2px -2px #7f7f7f;
       border-top-width: 0;
       background-image: linear-gradient(to bottom, #fff);
       box-shadow: none; }
@@ -291,15 +291,15 @@ entry, spinbutton {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: gray;
-        border-color: gray;
+        color: #7f7f7f;
+        border-color: #7f7f7f;
         background-image: linear-gradient(to bottom, white);
         box-shadow: none; }
         .linked.vertical entry:last-child:disabled:backdrop, .linked.vertical spinbutton:last-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: gray;
+          color: #7f7f7f;
           background-image: linear-gradient(to bottom, #fff);
           box-shadow: 0 1px rgba(255, 255, 255, 0); }
       .linked.vertical entry:last-child:backdrop, .linked.vertical spinbutton:last-child:backdrop {
@@ -317,7 +317,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
       border-color: #cc0000;
-      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #f5cccc; }
+      box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #f4cccc; }
     entry.error:selected, entry.error:selected:focus, spinbutton.error:selected, spinbutton.error:selected:focus {
       background-color: #cc0000; }
   entry.warning, spinbutton.warning {
@@ -328,7 +328,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
       border-color: #f57900;
-      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #fde4cc; }
+      box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #fde4cc; }
     entry.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected, spinbutton.warning:selected:focus {
       background-color: #f57900; }
 
@@ -349,13 +349,13 @@ button {
   color: #000;
   background-image: none;
   background-color: #fff;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   button:hover, button.flat:hover, button.sidebar-button:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none;
     -gtk-icon-effect: highlight; }
   button:active, button.flat:active, button.sidebar-button:active, button:checked, button.flat:checked, button.sidebar-button:checked {
@@ -364,14 +364,14 @@ button {
     background-image: none;
     color: white;
     background-color: black;
-    border-color: gray;
+    border-color: #7f7f7f;
     transition-duration: 50ms; }
   button:backdrop, button.flat:backdrop, button.sidebar-button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -379,37 +379,37 @@ button {
       border-width: 2px;
       border-style: solid;
       color: white;
-      background-color: #8d8d8d;
-      border-color: #8d8d8d;
+      background-color: #8b8b8b;
+      border-color: #8b8b8b;
       background-image: none; }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
     button:backdrop:disabled:active, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      border-color: #8d8d8d;
+      color: #7f7f7f;
+      border-color: #8b8b8b;
       background-image: none;
-      background-color: #f6f6f6; }
+      background-color: whitesmoke; }
   button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
     button:disabled:active, button:disabled.flat:active, button.sidebar-button:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      border-color: gray;
+      color: #7f7f7f;
+      border-color: #7f7f7f;
       background-image: none;
       background-color: white; }
   .osd button {
@@ -440,7 +440,7 @@ button {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: gray; }
+      color: #7f7f7f; }
     .osd button:backdrop {
       border-width: 2px;
       border-style: solid; }
@@ -477,16 +477,16 @@ button {
       button.suggested-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
     button.suggested-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -523,16 +523,16 @@ button {
       button.destructive-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
     button.destructive-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -552,13 +552,13 @@ button {
   color: #000;
   background-image: none;
   background-color: #fff;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   .inline-toolbar toolbutton > button:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none; }
   .inline-toolbar toolbutton > button:active {
     border-width: 2px;
@@ -566,21 +566,21 @@ button {
     background-image: none;
     color: white;
     background-color: black;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   .inline-toolbar toolbutton > button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    border-color: gray;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
     background-image: none;
     background-color: white; }
   .inline-toolbar toolbutton > button:backdrop {
@@ -588,7 +588,7 @@ button {
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -596,23 +596,23 @@ button {
     border-width: 2px;
     border-style: solid;
     color: white;
-    background-color: #8d8d8d;
-    border-color: #8d8d8d;
+    background-color: #8b8b8b;
+    border-color: #8b8b8b;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    border-color: #8d8d8d;
+    color: #7f7f7f;
+    border-color: #8b8b8b;
     background-image: none;
-    background-color: #f6f6f6; }
+    background-color: whitesmoke; }
 
 toolbar.inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, searchbar.inline-toolbar toolbutton > button.sidebar-button {
   border-radius: 0;
@@ -702,7 +702,7 @@ modelbutton.flat,
       background-color: #000; }
   modelbutton.flat:disabled,
   .menuitem.button.flat:disabled {
-    color: gray; }
+    color: #7f7f7f; }
 
 button.color {
   padding: 4px; }
@@ -745,8 +745,8 @@ spinbutton {
    */ }
   spinbutton button {
     background-image: none;
-    border-color: rgba(128, 128, 128, 0.3);
-    color: #0d0d0d;
+    border-color: rgba(127, 127, 127, 0.3);
+    color: #0c0c0c;
     border-radius: 0; }
     spinbutton button:dir(ltr) {
       border-style: none none none solid; }
@@ -761,7 +761,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:disabled {
       box-shadow: none;
-      color: rgba(128, 128, 128, 0.3); }
+      color: rgba(127, 127, 127, 0.3); }
       spinbutton button:disabled:dir(ltr) {
         border-style: none none none solid; }
       spinbutton button:disabled:dir(rtl) {
@@ -770,7 +770,7 @@ spinbutton {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     spinbutton button:backdrop {
-      border-color: rgba(141, 141, 141, 0.3);
+      border-color: rgba(139, 139, 139, 0.3);
       background-color: #fff;
       box-shadow: none; }
       spinbutton button:backdrop:dir(ltr) {
@@ -779,7 +779,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:backdrop:disabled {
       box-shadow: none;
-      color: rgba(128, 128, 128, 0.3); }
+      color: rgba(127, 127, 127, 0.3); }
       spinbutton button:backdrop:disabled:dir(rtl) {
         border-width: 0 1px 0 0; }
       spinbutton button:backdrop:disabled:dir(ltr) {
@@ -792,27 +792,27 @@ spinbutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     spinbutton.vertical button:first-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: white;
       background-color: black;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     spinbutton.vertical button:first-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     spinbutton.vertical button:first-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -821,7 +821,7 @@ spinbutton {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -831,27 +831,27 @@ spinbutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     spinbutton.vertical button:last-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: white;
       background-color: black;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     spinbutton.vertical button:last-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     spinbutton.vertical button:last-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -860,16 +860,16 @@ spinbutton {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
   spinbutton.vertical button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none; }
   spinbutton.vertical.entry {
     border-radius: 0; }
@@ -890,7 +890,7 @@ combobox {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: gray;
+    color: #7f7f7f;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
@@ -898,7 +898,7 @@ combobox {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
-    color: gray; }
+    color: #7f7f7f; }
   combobox arrow {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
     min-height: 16px;
@@ -935,25 +935,25 @@ toolbar, searchbar {
     padding: 3px;
     border-radius: 0  0 4px 4px; }
   toolbar.vertical, searchbar.vertical {
-    border-right: 1px solid gray; }
+    border-right: 1px solid #7f7f7f; }
     toolbar.vertical:dir(rtl), searchbar.vertical:dir(rtl) {
       border-right: none;
-      border-left: 1px solid gray; }
+      border-left: 1px solid #7f7f7f; }
 
 searchbar {
   border-width: 0 0 1px;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-style: none none solid none;
   padding: 3px; }
 
 toolbar.inline-toolbar, searchbar.inline-toolbar {
   border-style: solid;
-  border-color: gray;
-  background-color: #d9d9d9;
-  box-shadow: inset 0 2px 3px -1px #a4a4a4; }
+  border-color: #7f7f7f;
+  background-color: #d8d8d8;
+  box-shadow: inset 0 2px 3px -1px #a2a2a2; }
   toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop {
-    border-color: #8d8d8d;
-    background-color: #d7d7d7;
+    border-color: #8b8b8b;
+    background-color: #d6d6d6;
     box-shadow: none; }
 
 /***************
@@ -963,15 +963,15 @@ toolbar.inline-toolbar, searchbar.inline-toolbar {
 headerbar {
   border-width: 0 0 1px;
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, white, #fff);
-  box-shadow: inset 0 -1px #d9d9d9, inset 0 1px #fff;
+  box-shadow: inset 0 -1px #d8d8d8, inset 0 1px #fff;
   padding: 6px; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-color: #fff;
     background-image: none;
     box-shadow: none; }
@@ -997,7 +997,7 @@ headerbar {
     color: black;
     text-shadow: 0 1px rgba(0, 0, 0, 0.5);
     background-image: linear-gradient(to bottom, #0d0d0d, #050505);
-    box-shadow: inset 0 -1px #d9d9d9, inset 0 1px gray; }
+    box-shadow: inset 0 -1px #d8d8d8, inset 0 1px #7f7f7f; }
     .titlebar.selection-mode button,
     headerbar.selection-mode button {
       border-width: 2px;
@@ -1026,9 +1026,9 @@ headerbar {
       headerbar.selection-mode button:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -1047,9 +1047,9 @@ headerbar {
       headerbar.selection-mode button:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1058,14 +1058,14 @@ headerbar {
         color: #000;
         background-image: none;
         background-color: #fff;
-        border-color: gray; }
+        border-color: #7f7f7f; }
         .titlebar.selection-mode button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
           border-width: 2px;
           border-style: solid;
           color: #000;
           background-color: #fff;
-          border-color: gray;
+          border-color: #7f7f7f;
           background-image: none; }
         .titlebar.selection-mode button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1074,14 +1074,14 @@ headerbar {
           background-image: none;
           color: white;
           background-color: black;
-          border-color: gray; }
+          border-color: #7f7f7f; }
         .titlebar.selection-mode button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: gray;
+          border-color: #7f7f7f;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1091,7 +1091,7 @@ headerbar {
           border-style: solid;
           color: #000;
           background-color: #fff;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1099,9 +1099,9 @@ headerbar {
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none; }
     .titlebar.selection-mode .selection-menu,
     headerbar.selection-mode .selection-menu {
@@ -1144,27 +1144,27 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: gray;
+  border-left-color: #7f7f7f;
   border-top-color: #fff; }
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: gray;
+    border-left-color: #7f7f7f;
     border-top-color: rgba(0, 0, 0, 0.1); }
   treeview.view:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     treeview.view:disabled:selected {
       color: #666666; }
       treeview.view:disabled:selected:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     treeview.view:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   treeview.view.separator:backdrop {
     min-height: 2px;
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
     color: #000;
-    border-left-color: gray;
+    border-left-color: #7f7f7f;
     border-top: #fff; }
   treeview.view.dnd {
     border-style: solid none;
@@ -1172,21 +1172,21 @@ treeview.view {
     border-color: black; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #4d4d4d; }
+    color: #4c4c4c; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #000; }
     treeview.view.expander:selected {
-      color: #b3b3b3; }
+      color: #b2b2b2; }
       treeview.view.expander:selected:hover {
         color: #fff; }
       treeview.view.expander:selected:backdrop {
-        color: #b3b3b3; }
+        color: #b2b2b2; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #4d4d4d; }
+      color: #4c4c4c; }
   treeview.view.progressbar {
     color: #fff;
     border: 1px solid #000;
@@ -1207,12 +1207,12 @@ treeview.view {
       border-style: solid;
       border-color: #000; }
   treeview.view header button {
-    color: gray;
+    color: #7f7f7f;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #404040;
+      color: #3f3f3f;
       box-shadow: none; }
     treeview.view header button:active {
       color: #fff; }
@@ -1225,15 +1225,15 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   border-radius: 0;
   border-width: 1px;
   background-image: none;
-  border-color: gray;
+  border-color: #7f7f7f;
   text-shadow: none; }
   treeview.view header button:disabled {
     border-color: #fff;
     background-image: none; }
   treeview.view header button:backdrop {
-    border-color: gray;
+    border-color: #7f7f7f;
     border-style: none solid solid none;
-    color: gray;
+    color: #7f7f7f;
     background-image: none;
     background-color: #fff; }
     treeview.view header button:backdrop:disabled {
@@ -1270,7 +1270,7 @@ menubar,
       color: #000; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: gray;
+      color: #7f7f7f;
       box-shadow: none; }
 
 menu,
@@ -1278,7 +1278,7 @@ menu,
   margin: 4px;
   padding: 0px;
   background-color: #fff;
-  border: 1px solid gray; }
+  border: 1px solid #7f7f7f; }
   menu menuitem,
   .menu menuitem {
     text-shadow: none;
@@ -1290,10 +1290,10 @@ menu,
       background-color: #000; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
@@ -1326,7 +1326,7 @@ menuitem check, menuitem radio {
 popover {
   margin: 10px;
   padding: 2px;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-width: 1px;
   border-style: solid;
   border-radius: 5px;
@@ -1357,7 +1357,7 @@ popover {
   popover.magnifier, popover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
-    border: 1px solid gray;
+    border: 1px solid #7f7f7f;
     color: #fff; }
     popover.magnifier button, popover.osd button {
       color: white;
@@ -1387,7 +1387,7 @@ popover {
         border-width: 2px;
         border-style: solid;
         border-color: rgba(255, 255, 255, 0.2);
-        color: gray; }
+        color: #7f7f7f; }
 
 /*****************
  * Notebooks and *
@@ -1400,13 +1400,13 @@ notebook {
   notebook:backdrop {
     background-color: #fff; }
   notebook.frame {
-    border: 1px solid gray; }
+    border: 1px solid #7f7f7f; }
     notebook.frame:backdrop {
-      border-color: #8d8d8d; }
+      border-color: #8b8b8b; }
   notebook header {
-    background-color: #d9d9d9; }
+    background-color: #d8d8d8; }
     .frame notebook header {
-      border: 1px solid gray; }
+      border: 1px solid #7f7f7f; }
       .frame notebook header.top {
         border-bottom-width: 0; }
       .frame notebook header.bottom {
@@ -1416,34 +1416,34 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #8d8d8d; }
+        border-color: #8b8b8b; }
     notebook header.top {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #7f7f7f; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #8d8d8d; }
+        box-shadow: inset 0 -1px #8b8b8b; }
     notebook header.bottom {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #7f7f7f; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #8d8d8d; }
+        box-shadow: inset 0 1px #8b8b8b; }
     notebook header.right {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #7f7f7f; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #8d8d8d; }
+        box-shadow: inset 1px 0 #8b8b8b; }
     notebook header.left {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #7f7f7f; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #8d8d8d; }
+        box-shadow: inset -1px 0 #8b8b8b; }
     notebook header:backdrop {
-      background-color: #d7d7d7;
+      background-color: #d6d6d6;
       box-shadow: none; }
     notebook header tabs arrow {
-      color: gray; }
+      color: #7f7f7f; }
       notebook header tabs arrow:hover {
-        color: #404040; }
-      notebook header tabs arrow:active {
+        color: #3f3f3f; }
+      notebook header tabs arrow:checked {
         color: #000; }
       notebook header tabs arrow:disabled {
-        color: rgba(128, 128, 128, 0.3); }
+        color: rgba(127, 127, 127, 0.3); }
       notebook header tabs arrow:backdrop {
         color: rgba(0, 0, 0, 0.4); }
   notebook header.top tab {
@@ -1481,8 +1481,8 @@ notebook {
     background-color: transparent;
     outline-offset: 0; }
     notebook tab:hover {
-      border-color: gray; }
-    notebook tab:active, notebook tab:backdrop:active {
+      border-color: #7f7f7f; }
+    notebook tab:checked, notebook tab:backdrop:checked {
       border-color: #000; }
     notebook tab:backdrop {
       background-color: transparent;
@@ -1490,17 +1490,17 @@ notebook {
     .top notebook tab.reorderable-page {
       border-color: transparent; }
       .top notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-bottom-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-bottom-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
-      .top notebook tab.reorderable-page:active {
+      .top notebook tab.reorderable-page:checked {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-bottom-color: #000; }
-        .top notebook tab.reorderable-page:active:hover {
+        .top notebook tab.reorderable-page:checked:hover {
           background-color: rgba(255, 255, 255, 0.7); }
-        .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+        .top notebook tab.reorderable-page:checked:backdrop {
+          border-color: #8b8b8b;
           background-color: #fff;
           border-bottom-color: #000; }
       .top notebook tab.reorderable-page:backdrop {
@@ -1509,17 +1509,17 @@ notebook {
     .bottom notebook tab.reorderable-page {
       border-color: transparent; }
       .bottom notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-top-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-top-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
-      .bottom notebook tab.reorderable-page:active {
+      .bottom notebook tab.reorderable-page:checked {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-top-color: #000; }
-        .bottom notebook tab.reorderable-page:active:hover {
+        .bottom notebook tab.reorderable-page:checked:hover {
           background-color: rgba(255, 255, 255, 0.7); }
-        .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+        .bottom notebook tab.reorderable-page:checked:backdrop {
+          border-color: #8b8b8b;
           background-color: #fff;
           border-top-color: #000; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -1528,17 +1528,17 @@ notebook {
     .left notebook tab.reorderable-page {
       border-color: transparent; }
       .left notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-right-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-right-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
-      .left notebook tab.reorderable-page:active {
+      .left notebook tab.reorderable-page:checked {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-right-color: #000; }
-        .left notebook tab.reorderable-page:active:hover {
+        .left notebook tab.reorderable-page:checked:hover {
           background-color: rgba(255, 255, 255, 0.7); }
-        .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+        .left notebook tab.reorderable-page:checked:backdrop {
+          border-color: #8b8b8b;
           background-color: #fff;
           border-right-color: #000; }
       .left notebook tab.reorderable-page:backdrop {
@@ -1547,17 +1547,17 @@ notebook {
     .right notebook tab.reorderable-page {
       border-color: transparent; }
       .right notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-left-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-left-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
-      .right notebook tab.reorderable-page:active {
+      .right notebook tab.reorderable-page:checked {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-left-color: #000; }
-        .right notebook tab.reorderable-page:active:hover {
+        .right notebook tab.reorderable-page:checked:hover {
           background-color: rgba(255, 255, 255, 0.7); }
-        .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+        .right notebook tab.reorderable-page:checked:backdrop {
+          border-color: #8b8b8b;
           background-color: #fff;
           border-left-color: #000; }
       .right notebook tab.reorderable-page:backdrop {
@@ -1566,15 +1566,15 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: gray;
+      color: #7f7f7f;
       /* color: inherit doesn't work here */ }
       notebook tab label:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     notebook tab:hover label {
-      color: #404040; }
-    notebook tab:active label {
+      color: #3f3f3f; }
+    notebook tab:checked label {
       color: #000; }
-      notebook tab:active label:backdrop {
+      notebook tab:checked label:backdrop {
         color: #000; }
     notebook tab button {
       border: 2px solid transparent;
@@ -1587,18 +1587,18 @@ notebook {
         border-style: solid;
         color: #000;
         background-color: #fff;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         border-width: 2px;
         background-image: none;
         box-shadow: none; }
-      notebook tab button:active {
+      notebook tab button:checked {
         border-width: 2px;
         border-style: solid;
         background-image: none;
         color: white;
         background-color: black;
-        border-color: gray;
+        border-color: #7f7f7f;
         border-width: 2px; }
       notebook tab button:backdrop, notebook tab button:backdrop:hover {
         color: rgba(0, 0, 0, 0.3);
@@ -1626,11 +1626,11 @@ scrollbar {
   scrollbar slider {
     border-radius: 20px;
     border: 5px solid transparent;
-    background-color: gray; }
+    background-color: #7f7f7f; }
     scrollbar slider:backdrop, scrollbar slider:disabled {
-      background-color: #e6e6e6; }
+      background-color: #e5e5e5; }
     scrollbar slider:hover {
-      background-color: #4d4d4d; }
+      background-color: #4c4c4c; }
     scrollbar slider:hover:active {
       background-color: #000; }
     scrollbar slider.fine-tune {
@@ -1666,8 +1666,8 @@ switch {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
-  border-color: gray;
-  background-color: #cccccc;
+  border-color: #7f7f7f;
+  background-color: #cbcbcb;
   box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
   /*outset not working*/
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
@@ -1677,25 +1677,25 @@ switch {
     background-color: #000;
     text-shadow: 0 0 2px white; }
   switch:disabled {
-    color: gray;
-    border-color: gray;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
     background-color: white;
     text-shadow: none; }
   switch:backdrop {
     color: #000;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-color: #fff;
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
       color: #fff;
-      border-color: #8d8d8d;
-      background-color: #8d8d8d;
+      border-color: #8b8b8b;
+      background-color: #8b8b8b;
       box-shadow: none; }
     switch:backdrop:disabled, switch:backdrop:disabled:active {
       background-color: white;
-      color: gray;
-      border-color: gray; }
+      color: #7f7f7f;
+      border-color: #7f7f7f; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -1707,24 +1707,24 @@ switch {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray;
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; }
+    border-color: #7f7f7f;
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
     switch slider:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
-      box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; }
+      box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
     switch slider:active {
       border-color: #000; }
     switch slider:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -1733,18 +1733,18 @@ switch {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
       switch slider:backdrop:active {
-        border-color: #8d8d8d; }
+        border-color: #8b8b8b; }
       switch slider:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
 
 /*************************
@@ -1763,15 +1763,15 @@ check {
   check:checked, check:active {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
     check:checked:disabled, check:active:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       check:checked:disabled:backdrop, check:active:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     check:checked:backdrop, check:active:backdrop {
       color: #000; }
   check:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     check:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   check:indeterminate {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
   check:backdrop {
@@ -1788,15 +1788,15 @@ radio {
   radio:checked, radio:active {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
     radio:checked:disabled, radio:active:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       radio:checked:disabled:backdrop, radio:active:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     radio:checked:backdrop, radio:active:backdrop {
       color: #000; }
   radio:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     radio:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   radio:indeterminate {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
   radio:backdrop {
@@ -1842,9 +1842,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray;
+    border-color: #7f7f7f;
     border-radius: 50%;
-    border-color: #787878; }
+    border-color: #777777; }
     scale trough slider:hover,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:hover,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:hover {
@@ -1852,9 +1852,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
-      border-color: #787878;
+      border-color: #777777;
       border-radius: 50%; }
     scale trough slider:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:disabled,
@@ -1868,7 +1868,7 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #858585;
+      border-color: #838383;
       background-image: none;
       box-shadow: none; }
     scale trough slider:backdrop:disabled,
@@ -1876,9 +1876,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
     scale trough slider:active,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
@@ -1891,8 +1891,8 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: gray;
-    background-color: #cccccc;
+    border-color: #7f7f7f;
+    background-color: #cbcbcb;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     scale trough.highlight,
     scale.scale-has-marks-above.scale-has-marks-below trough.highlight,
@@ -1902,28 +1902,28 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       scale trough.highlight:backdrop,
       scale.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop,
       scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop {
-        border-color: gray;
-        background-color: gray;
+        border-color: #7f7f7f;
+        background-color: #7f7f7f;
         box-shadow: none; }
     scale trough:disabled, scale trough.hilight:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled {
-      border-color: gray;
+      border-color: #7f7f7f;
       background-color: white; }
     scale trough:backdrop,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop {
-      border-color: #8d8d8d;
-      background-color: silver;
+      border-color: #8b8b8b;
+      background-color: #bfbfbf;
       box-shadow: none; }
     scale trough:backdrop:disabled, scale trough .hilight:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled {
-      border-color: gray;
+      border-color: #7f7f7f;
       background-color: #fff; }
 
 /*****************
@@ -1934,17 +1934,17 @@ progressbar {
   font-size: 83%;
   color: #000; }
   progressbar:backdrop {
-    color: gray; }
+    color: #7f7f7f; }
   progressbar trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: gray;
-    background-color: lightgray;
+    border-color: #7f7f7f;
+    background-color: #d2d2d2;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     progressbar trough:backdrop {
-      border-color: #8d8d8d;
-      background-color: #d7d7d7;
+      border-color: #8b8b8b;
+      background-color: #d6d6d6;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   progressbar.osd trough {
     background-color: transparent;
@@ -1981,8 +1981,8 @@ levelbar trough {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-  border-color: gray;
-  box-shadow: inset 0 2px 2px -2px gray; }
+  border-color: #7f7f7f;
+  box-shadow: inset 0 2px 2px -2px #7f7f7f; }
   levelbar trough:backdrop {
     background-color: transparent;
     border-style: solid;
@@ -2049,7 +2049,7 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
   spinbutton selection:backdrop:focus, modelbutton.flat:backdrop:hover, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:hover,
   .menuitem.button.flat:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected {
-    background-color: gray;
+    background-color: #7f7f7f;
     color: #fff; }
 
 /**********
@@ -2057,19 +2057,19 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
  **********/
 frame border,
 .frame {
-  border: 1px solid gray;
+  border: 1px solid #7f7f7f;
   padding: 0; }
   frame border.flat,
   .frame.flat {
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #8d8d8d; }
+    border-color: #8b8b8b; }
 
 actionbar box {
   padding: 6px;
   border-width: 1px 0 0;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-style: solid none none; }
 
 placessidebar .frame,
@@ -2080,7 +2080,7 @@ scrolledwindow viewport.frame {
   border-style: none; }
 placessidebar overshoot.top,
 scrolledwindow overshoot.top {
-  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center top;
@@ -2089,7 +2089,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -2098,7 +2098,7 @@ scrolledwindow overshoot.top {
     box-shadow: none; }
 placessidebar overshoot.bottom,
 scrolledwindow overshoot.bottom {
-  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center bottom;
@@ -2107,7 +2107,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -2116,7 +2116,7 @@ scrolledwindow overshoot.bottom {
     box-shadow: none; }
 placessidebar overshoot.left,
 scrolledwindow overshoot.left {
-  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: left center;
@@ -2125,7 +2125,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -2134,7 +2134,7 @@ scrolledwindow overshoot.left {
     box-shadow: none; }
 placessidebar overshoot.right,
 scrolledwindow overshoot.right {
-  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: right center;
@@ -2143,7 +2143,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -2211,7 +2211,7 @@ placessidebar .view separator:backdrop,
 placessidebar textview text separator:backdrop,
 textview placessidebar text separator:backdrop,
 placessidebar iconview separator:backdrop {
-  background: gray;
+  background: #7f7f7f;
   min-width: 1px;
   min-height: 1px; }
 
@@ -2220,10 +2220,10 @@ placessidebar iconview separator:backdrop {
  *********/
 list {
   background-color: #fff;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   list:backdrop {
     background-color: #fff;
-    border-color: #8d8d8d; }
+    border-color: #8b8b8b; }
   list row {
     padding: 2px; }
 
@@ -2255,7 +2255,7 @@ row.activatable {
     row.activatable:selected:hover, placessidebar .has-open-popup:selected {
       background-color: black; }
     row.activatable:selected:backdrop {
-      background-color: gray; }
+      background-color: #7f7f7f; }
     row.activatable:selected .button.flat {
       color: #fff; }
       row.activatable:selected .button.flat:hover {
@@ -2283,9 +2283,9 @@ row.activatable {
   padding: 10px;
   border-width: 0 1px 1px;
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-radius: 0 0 6px 6px;
-  background-image: linear-gradient(to bottom, #f0f0f0 5%, whitesmoke); }
+  background-image: linear-gradient(to bottom, #efefef 5%, #f4f4f4); }
   .app-notification .button,
   .app-notification.frame .button {
     padding: 6px; }
@@ -2308,22 +2308,22 @@ expander arrow {
  * Calendar *
  ***********/
 calendar {
-  border: 1px solid gray; }
+  border: 1px solid #7f7f7f; }
   calendar.button {
     padding: 0 4px;
     color: #999999; }
     calendar.button:hover {
       color: #000; }
     calendar.button:backdrop, calendar.button:backdrop:hover {
-      color: gray; }
+      color: #7f7f7f; }
   calendar.view {
     border-radius: 2px; }
   calendar.header {
     background: linear-gradient(to bottom, white, #fafafa);
-    border-bottom-color: silver; }
+    border-bottom-color: #bfbfbf; }
     calendar.header:backdrop {
       background-image: linear-gradient(to bottom, #fff);
-      border-bottom-color: #c6c6c6; }
+      border-bottom-color: #c5c5c5; }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
@@ -2349,13 +2349,13 @@ messagedialog.csd {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     messagedialog.csd .dialog-action-area button:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     messagedialog.csd .dialog-action-area button:active {
       border-width: 2px;
@@ -2363,13 +2363,13 @@ messagedialog.csd {
       background-image: none;
       color: white;
       background-color: black;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     messagedialog.csd .dialog-action-area button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2378,16 +2378,16 @@ messagedialog.csd {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     messagedialog.csd .dialog-action-area button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
     messagedialog.csd .dialog-action-area button.suggested-action {
       border-width: 2px;
@@ -2422,16 +2422,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.suggested-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2468,16 +2468,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.destructive-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2491,9 +2491,9 @@ messagedialog.csd {
     border-bottom-left-radius: 7px; }
 
 GtkFileChooserDialog .dialog-action-box {
-  border-top: 1px solid gray; }
+  border-top: 1px solid #7f7f7f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #8d8d8d; }
+    border-top-color: #8b8b8b; }
 
 /***********
  * Sidebar *
@@ -2503,10 +2503,10 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #fff; }
   .sidebar > scrolledwindow > .frame {
-    border-right: 1px solid gray; }
+    border-right: 1px solid #7f7f7f; }
     .sidebar > scrolledwindow > .frame:dir(rtl) {
       border-right: none;
-      border-left: 1px solid gray; }
+      border-left: 1px solid #7f7f7f; }
 
 placessidebar row {
   padding: 0px; }
@@ -2533,9 +2533,9 @@ placessidebar .view, placessidebar textview text, textview placessidebar text, p
   color: #000;
   background-color: transparent; }
   placessidebar .view .image, placessidebar textview text .image, textview placessidebar text .image, placessidebar iconview .image {
-    color: #4d4d4d; }
+    color: #4c4c4c; }
     placessidebar .view .image:selected, placessidebar textview text .image:selected, textview placessidebar text .image:selected, placessidebar iconview .image:selected {
-      color: #e6e6e6; }
+      color: #e5e5e5; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2559,9 +2559,9 @@ paned placessidebar iconview separator:backdrop,
 placessidebar iconview paned separator:backdrop {
   min-width: 1px;
   min-height: 1px;
-  background-image: linear-gradient(to bottom, gray); }
+  background-image: linear-gradient(to bottom, #7f7f7f); }
   paned separator:backdrop {
-    background-image: linear-gradient(to bottom, #8d8d8d); }
+    background-image: linear-gradient(to bottom, #8b8b8b); }
 paned:dir(ltr).horizontal separator {
   margin: 0 -8px 0 0;
   padding: 0 8px 0 0; }
@@ -2602,7 +2602,7 @@ placessidebar iconview paned separator.wide:backdrop {
   min-height: 5px;
   background-color: transparent;
   border-style: none solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-width: 1px; }
 
 /**************
@@ -2656,9 +2656,9 @@ infobar {
     .error button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2680,9 +2680,9 @@ infobar {
     .error button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
   .info label:selected,
   .info label:selected:focus,
@@ -2784,20 +2784,20 @@ colorswatch {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     colorswatch#add-color-button:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     colorswatch#add-color-button:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2828,7 +2828,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #fff;
-    border: solid 1px #8d8d8d;
+    border: solid 1px #8b8b8b;
     box-shadow: none; }
 
 button.titlebutton {
@@ -2843,20 +2843,20 @@ button.titlebutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   button.titlebutton:active {
     border-width: 2px;
     border-style: solid;
     background-image: none;
     color: white;
     background-color: black;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   button.titlebutton:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2941,7 +2941,7 @@ cursor-handle {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: gray; }
+      color: #7f7f7f; }
     .touch-selection button:backdrop {
       border-width: 2px;
       border-style: solid; }
-- 
2.30.2